Merge branch 'new_ui' into tizen

Conflicts:
	services/BookmarkService/BookmarkService.cpp
	services/SimpleUI/SimpleUI.cpp
	services/WebKitEngineService/WebView.cpp

Change-Id: If7f333aa9127d034e9a4f0ade2d303688572ee2e

diff --cc services/SimpleUI/SimpleUI.cpp
index 6798e9c3b84d37ba9b6661e9fe3f7c29fecdfc72,94d6a80105d83a7b9afeefb4d60ce17f82b2d257..9f3c77e196379168fc6f939149216cbdf1080777
--- 1/services/SimpleUI/SimpleUI.cpp
--- 2/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@@ -69,13 -73,13 +73,14 @@@ SimpleUI::SimpleUI(
      , items_vector()
      , m_networkErrorPopup(0)
      , m_wvIMEStatus(false)
 +    , m_ewkContext(ewk_context_new())
  {
-     elm_init(static_cast<int>(NULL), static_cast<char**>(NULL));
+     elm_init(0, nullptr);
+     ewk_context_default_get();
      Evas_Object *main_window = elm_win_util_standard_add("browserApp", "browserApp");
-     if (main_window == NULL)
+     if (main_window == nullptr)
          BROWSER_LOGE("Failed to create main window");
- //    m_zoomList = NULL;
+ 
      setMainWindow(main_window);
  }
  

diff --cc services/SimpleUI/SimpleUI.h
Simple merge

diff --cc services/WebKitEngineService/WebView.cpp
index acf79a37c29aa5503f296de7a800c61799d183d0,77518269c1c31efe5e5d3a0aed7b11be5207fcdf..4bb27ed3960f95a9e15f1e983f961a4c4869f2a7
--- 1/services/WebKitEngineService/WebView.cpp
--- 2/services/WebKitEngineService/WebView.cpp
+++ b/services/WebKitEngineService/WebView.cpp
@@@ -56,8 -60,8 +60,9 @@@ namespace webkitengine_service 
  WebView::WebView(Evas_Object * obj, TabId tabId)
      : m_parent(obj)
      , m_tabId(tabId)
-     , m_ewkView(NULL)
 +    , m_ewkContext(ewk_context_new())
+     , m_title(std::string())
+     , m_ewkView(nullptr)
      , m_isLoading(false)
      , m_loadError(false)
  {