Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 2 insertions, 2 deletions

diff --git a/js/components/core/class-uuid.js b/js/components/core/class-uuid.js
index 6c5530c4..010495e7 100755
--- a/js/components/core/class-uuid.js
+++ b/js/components/core/class-uuid.js
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
  </notice> */
 
 /**
-        @module components/core/class-uuid
+    @module components/core/class-uuid
     @requires montage/core/core
 */
 /**
@@ -62,7 +62,7 @@ var Montage = require("montage/core/core").Montage,
                 id[2] = c[(r >>>= 4) & 0xf];
                 id[3] = c[(r >>>= 4) & 0xf];
                 id[4] = c[(r >>>= 4) & 0xf];
-                
+
                 return id.join('');
             }
         }