Merged from Master

2016-01-14 17:23:53 -08:00
parent 3e7eb11d84 88f8925d17
commit 032b2542f0
84 changed files with 605 additions and 3970 deletions
--- a/platform/core/src/identifiers/IdentifierProvider.js
+++ b/platform/core/src/identifiers/IdentifierProvider.js
@@ -22,7 +22,7 @@
 /*global define*/

 define(
-    ["uuid", "./Identifier"],
+    ["../../lib/uuid", "./Identifier"],
    function (uuid, Identifier) {
        'use strict';