Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
	automated-tests/src/dali-toolkit/utc-Dali-Cluster.cpp
	automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
	automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
	automated-tests/src/dali-toolkit/utc-Dali-View.cpp
	dali-toolkit/internal/controls/buttons/button-impl.cpp
	dali-toolkit/internal/controls/buttons/push-button-impl.cpp
	dali-toolkit/internal/controls/buttons/push-button-impl.h
	dali-toolkit/internal/controls/cluster/cluster-impl.cpp
	dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
	dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
	dali-toolkit/internal/controls/popup/popup-impl.cpp
	dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
	dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
	dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
	dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
	dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
	dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
	dali-toolkit/internal/controls/scrollable/scrollable-impl.h
	dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
	dali-toolkit/internal/controls/slider/slider-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-field-impl.h
	dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-label-impl.h
	dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
	dali-toolkit/internal/controls/view/view-impl.cpp
	dali-toolkit/internal/controls/view/view-impl.h
	dali-toolkit/internal/file.list
	dali-toolkit/internal/text/clipping/text-clipper.cpp
	dali-toolkit/internal/text/decorator/text-decorator.cpp
	dali-toolkit/internal/text/decorator/text-decorator.h
	dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
	dali-toolkit/internal/text/text-control-interface.h
	dali-toolkit/internal/text/text-controller.cpp
	dali-toolkit/internal/text/text-controller.h
	dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp
	dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
	dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
	dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
	dali-toolkit/public-api/controls/buttons/push-button.cpp
	dali-toolkit/public-api/controls/cluster/cluster-style.cpp
	dali-toolkit/public-api/controls/control-impl.cpp
	dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
	dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
	dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
	dali-toolkit/public-api/controls/text-controls/text-field.cpp
	dali-toolkit/public-api/controls/text-controls/text-field.h
	dali-toolkit/public-api/controls/view/view.h
	dali-toolkit/public-api/dali-toolkit-version.cpp
	docs/content/programming-guide/animation-example.h
	docs/content/programming-guide/animation-rotation.h
	docs/content/programming-guide/dynamics-bodies.h
	docs/content/programming-guide/size-negotiation.h
	packaging/dali-toolkit.spec
	plugins/dali-script-v8/src/object/property-value-wrapper.cpp

Change-Id: I5a0a9bc20a55ebcc9605c24d9ce1e688f0e6b9cc