Merge branch 'master' into tizen_2.2
Conflicts:
packaging/livebox.web-provider.spec
src/API/web_provider_livebox_info.cpp
src/API/web_provider_livebox_info.h
src/Core/Box.cpp
src/Core/Box.h
src/Core/BoxData.h
src/Core/BoxManager.cpp
src/Core/BoxManager.h
src/Core/BoxSchemeHandler.cpp
src/Core/Buffer/RenderBuffer.cpp
src/Core/IBox.h
src/Core/Service/MessageManager.cpp
src/Core/Service/PeriodChanger.cpp
src/Core/View/PdHelper.cpp
src/Core/View/WebView.cpp
src/Daemon/BoxDaemonImpl.cpp
src/Daemon/BoxDaemonImpl.h
src/Daemon/main.cpp
src/Plugin/AppBoxPlugin/AppBoxRenderBuffer.cpp
src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
src/Plugin/box_plugin_interface.h
Change-Id: Ic91c4903ab69ae7a05612c73a57017e328f46da5