Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	automated-tests/src/dali-toolkit/utc-Dali-TextView.cpp
	dali-toolkit/internal/controls/buttons/push-button-impl.cpp
	dali-toolkit/internal/controls/popup/popup-impl.cpp
	dali-toolkit/internal/controls/relayout-controller-impl.cpp
	dali-toolkit/internal/controls/relayout-controller.cpp
	dali-toolkit/internal/controls/relayout-helper.cpp
	dali-toolkit/internal/controls/slider/slider-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-impl.h
	dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
	dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
	dali-toolkit/internal/controls/text-view/text-view-impl.cpp
	dali-toolkit/internal/controls/text-view/text-view-impl.h
	dali-toolkit/public-api/controls/control-impl.cpp
	dali-toolkit/public-api/controls/control.h
	docs/content/main-page.h
	plugins/dali-script-v8/src/actors/actor-wrapper.h

Change-Id: Ia0aff01756e6d803616d9c4eae82f405c6cb2c0f