Merge branch 'master' into open671

2016-05-09 10:19:24 -07:00
parent 934eb13813 d6aa31e4aa
commit f3b265bdd5
70 changed files with 2241 additions and 1786 deletions
--- a/main.js
+++ b/main.js
@@ -92,11 +92,7 @@ define([
    './platform/entanglement/bundle',
    './platform/search/bundle',
    './platform/status/bundle',
-    './platform/commonUI/regions/bundle',
-
-    './example/imagery/bundle',
-    './example/eventGenerator/bundle',
-    './example/generator/bundle'
+    './platform/commonUI/regions/bundle'
 ], function (Main, legacyRegistry) {
    return {
        legacyRegistry: legacyRegistry,