Merge branch 'master' into open164

2016-02-23 16:03:24 -08:00
parent 25f3b1e110 77a2e0a70b
commit 99cf690ad4
62 changed files with 538 additions and 683 deletions
--- a/platform/commonUI/general/bundle.js
+++ b/platform/commonUI/general/bundle.js
@@ -137,6 +137,10 @@ define([
                {
                    "stylesheetUrl": "css/normalize.min.css",
                    "priority": "mandatory"
+                },
+                {
+                    "stylesheetUrl": "css/reset.css",
+                    "priority": "mandatory"
                }
            ],
            "templates": [