[Mobile] Merge

Fix Conflicts.

platform/commonUI/general/res/sass/_main.scss

@@ -27,10 +27,14 @@
 @import "compass/utilities";
 
 @import "mixins";
+@import "mobile/mixins";
+
 @import "effects";
 @import "global";
 @import "fonts";
 @import "user-environ/layout";
+@import "mobile/layout";
+
 @import "fixed-position";
 @import "about";
 @import "text";
@@ -45,6 +49,7 @@
 @import "controls/controls";
 @import "controls/lists";
 @import "controls/menus";
+@import "mobile/controls/menus";
 @import "controls/time-controller";
 @import "edit/editor";
 @import "features/imagery";