Merge remote-tracking branch 'origin/sandbox/jaehwan/devel' into tizen

Conflicts:
	src/modules/evas/engines/gl_drm/evas_drm.c

diff --cc src/modules/ecore_imf/wayland/wayland_imcontext.c
Simple merge

diff --cc src/modules/ecore_imf/wayland/wayland_module.c
index 53f24d4,48feed0..bd9b9a0
mode 100755,100644..100755
--- 1/src/modules/ecore_imf/wayland/wayland_module.c
--- 2/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@@ -165,9 -175,9 +176,10 @@@ im_module_shutdown(void
  {
     // TIZEN_ONLY(20150708): Support back key
     unregister_key_handler();
 +   unregister_ecore_event_handler();
     //
     EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module shutdown");
+    ecore_wl_shutdown();
  }
  
  EINA_MODULE_INIT(im_module_init);