Merge branch 'open-master' into open1272

Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js

platform/forms/res/templates/controls/color.html

@@ -30,7 +30,7 @@
     <span class="title-label" ng-if="structure.text">
         {{structure.text}}
     </span>
-    <span class='ui-symbol icon invoke-menu' ng-if="!structure.text">v</span>
+    <span class='ui-symbol invoke-menu' ng-if="!structure.text">v</span>
 
 
     <div

platform/forms/res/templates/controls/menu-button.html

@@ -28,7 +28,7 @@
     <span class="title-label" ng-if="structure.text">
         {{structure.text}}
     </span>
-    <span class='ui-symbol icon invoke-menu'
+    <span class='ui-symbol invoke-menu'
           ng-if="!structure.text">
         v
     </span>