[Merge] Merge in open-master, resolve conflicts in _constants.scss

2015-06-10 14:04:48 -07:00
parent 9f90c6b8d8 e6d830bfdc
commit d7e43026cd
36 changed files with 845 additions and 121 deletions
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -43,6 +43,10 @@
            {
                "key": "indicator",
                "templateUrl": "templates/indicator.html"
+            },
+            {
+              "key": "time-controller",
+              "templateUrl": "templates/controls/time-controller.html"
            }
        ],
        "controllers": [