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-TextLabel.cpp
	dali-toolkit/internal/atlas-manager/atlas-manager.h
	dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
	dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
	dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
	dali-toolkit/internal/file.list
	dali-toolkit/internal/text/decorator/text-decorator.cpp
	dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
	dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp
	dali-toolkit/internal/text/text-controller-impl.cpp
	dali-toolkit/internal/text/text-controller-impl.h
	dali-toolkit/internal/text/text-controller.cpp
	dali-toolkit/internal/text/text-controller.h
	dali-toolkit/public-api/controls/control-impl.cpp
	dali-toolkit/public-api/dali-toolkit-version.cpp
	docs/content/main-page.h
	docs/content/programming-guide/script-overview.h
	packaging/dali-toolkit.spec

Change-Id: I672b8fe4c79dcabd9a3fe323ad55a1a368cc0b0e