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

Conflicts:
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

1 files changed, 5 insertions, 3 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/objectManager.js b/js/helper-classes/RDGE/src/core/script/objectManager.js
index 0bb8b91b..303a69db 100755
--- a/js/helper-classes/RDGE/src/core/script/objectManager.js
+++ b/js/helper-classes/RDGE/src/core/script/objectManager.js
@@ -4,9 +4,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.

 </copyright> */

 

-/* generic handle-based object manager

-*/

-objectManager = function() {

+// RDGE namespaces

+var RDGE = RDGE || {};

+

+/* generic handle-based object manager */

+RDGE.objectManager = function() {

         this.guidCounter = 0;

         this.objects = [];

         this.numObjects = 0;