Merge "Moved SingletonService into dali-core" into devel/master

diff --cc dali/internal/clipboard/tizen-wayland/clipboard-impl-ecore-wl.cpp
index f3a1bb3,4204f1a..e411b45
mode 100755,100644..100755
--- 1/dali/internal/clipboard/tizen-wayland/clipboard-impl-ecore-wl.cpp
--- 2/dali/internal/clipboard/tizen-wayland/clipboard-impl-ecore-wl.cpp
+++ b/dali/internal/clipboard/tizen-wayland/clipboard-impl-ecore-wl.cpp

diff --cc dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
index c351e8a,db15ce9..bdbd873
--- 1/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
--- 2/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
@@@ -39,9 -40,10 +40,8 @@@
  #include <dali/integration-api/adaptor-framework/scene-holder.h>
  #include <dali/internal/input/common/key-impl.h>
  #include <dali/internal/system/common/locale-utils.h>
- #include <dali/internal/system/common/singleton-service-impl.h>
  #include <dali/internal/window-system/common/window-render-surface.h>
  
 -#define TOKEN_STRING(x) #x
 -
  Ecore_IMF_Input_Panel_Layout panelLayoutMap[] =
  {
     ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL,

diff --cc dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
Simple merge

diff --cc dali/internal/input/windows/input-method-context-impl-win.cpp
Simple merge