Merge branch 'intefl/surc'

Conflicts:
	themes/images/tizen-hd/00_winset_title_tabbar_bg.png
	themes/inc/tizen-hd-inc.edc
	themes/widgets/button.edc
	themes/widgets/multibuttonentry.edc

Change-Id: I7396ff0a07189cc43f825147cba332c8d2a6a8c9

diff --cc themes/inc/tizen-hd-inc.edc
Simple merge

diff --cc themes/widgets/button.edc
index 07ce9d3,29cfd1c..e8c62da
--- 1/themes/widgets/button.edc
--- 2/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@@ -8220,8 -8219,9 +8220,8 @@@ group { name: "elm/button/base/searchba
        alias: "elm/button/base/naviframe/prev_btn/default";
        alias: "elm/button/base/naviframe/end_btn/default";
        images {
 -         image: "00_winset_Back_btn_press.png" COMP;
 -         image: "00_winset_Back_btn_normal_focus.png" COMP;
 -         image: "00_winset_Back.png" COMP;
 +         image: "00_winset_toolbar_press.png" COMP;
-          image: "00_winset_Back.png" COMP;
++        image: "00_winset_Back.png" COMP;
        }
        script {
           public button_state = BUTTON_STATE_ENABLED;

diff --cc themes/widgets/ctxpopup.edc
Simple merge

diff --cc themes/widgets/genlist/genlist_macro.edc
Simple merge

diff --cc themes/widgets/genlist/genlist_normal.edc
Simple merge

diff --cc themes/widgets/popup.edc
Simple merge

diff --cc themes/widgets/toolbar.edc
index 460bf00,d9c0d82..19ae3ba
--- 1/themes/widgets/toolbar.edc
--- 2/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@@ -1139,16 -1140,13 +1140,20 @@@ group { name: "elm/toolbar/item/tabbar"
           }
           description { state: "disabled" 0.0;
              inherit: "default" 0.0;
-             visible: 0;
-             color: 255 255 255 0;
+          }
+          description { state: "moving" 0.0;
+             inherit: "default" 0.0;
+             visible: 1;
+             image.normal: "00_tab_move_bg.png";
+             image.border: 10 10 10 10;
           }
 +         description { state: "moving" 0.0;
 +            inherit: "default" 0.0;
 +            visible: 1;
 +            image.normal: "00_tab_move_bg.png";
 +            image.border: 10 10 10 10;
 +            color: 255 255 255 255;
 +         }
        }
        part { name: "padding_left_top";
              type: RECT;