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

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

Conflicts:
	adaptors/common/adaptor-impl.cpp
	build/tizen/adaptor/Makefile.am
	platform-abstractions/slp/file.list
	platform-abstractions/tizen/data-cache/data-cache-impl.cpp
	platform-abstractions/tizen/data-cache/data-cache-impl.h
	platform-abstractions/tizen/data-cache/data-cache-io.cpp
	platform-abstractions/tizen/data-cache/data-cache-io.h
	platform-abstractions/tizen/data-cache/metrics-cache.cpp
	platform-abstractions/tizen/data-cache/metrics-cache.h
	platform-abstractions/tizen/data-cache/tests/data-cache-debug.cpp
	platform-abstractions/tizen/data-cache/tests/data-cache-debug.h
	platform-abstractions/tizen/font-platform/font-controller-impl.cpp
	platform-abstractions/tizen/font-platform/font-controller-impl.h
	platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.cpp
	platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.h
	platform-abstractions/tizen/resource-loader/loader-font.cpp
	platform-abstractions/tizen/resource-loader/loader-font.h
	platform-abstractions/tizen/resource-loader/resource-loader.cpp
	platform-abstractions/tizen/resource-loader/resource-loader.h
	platform-abstractions/tizen/resource-loader/resource-text-requester.cpp
	platform-abstractions/tizen/resource-loader/resource-text-requester.h
	platform-abstractions/tizen/resource-loader/resource-thread-text.cpp
	platform-abstractions/tizen/resource-loader/resource-thread-text.h
	platform-abstractions/tizen/tizen-platform-abstraction.cpp

Change-Id: I41ba796de5a70404514cf9c0b599c1391f9bb771