Merge branch working into tizen
Conflicts:
CMakeLists.txt
packaging/wrt.spec
src/view/common/application_launcher.cpp
src/view/common/scheme_action_map_data.h
src/view/webkit/ewk_context_manager.cpp
src/view/webkit/injected-bundle/CMakeLists.txt
src/view/webkit/injected-bundle/wrt-injected-bundle.cpp
src/view/webkit/view_logic_service_support.cpp
src/wrt-client/window_data.cpp
src/wrt-client/wrt-client.cpp
src/wrt-client/wrt-client.h
src/wrt-launcher/wrt-launcher.cpp
src/wrt-launchpad-daemon/legacy/preload_list_wrt.txt
Change-Id: I34297e3a0e893eb64f0b62a776aa21f8b51ed930
15 files changed: