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

Conflicts:
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/Materials/PulseMaterial.js
	js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/preloader/Preloader.js

1 files changed, 3 insertions, 7 deletions

diff --git a/js/components/layout/subtool-button.reel/subtool-button.js b/js/components/layout/subtool-button.reel/subtool-button.js
index d1adca43..2b066f24 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.js
+++ b/js/components/layout/subtool-button.reel/subtool-button.js
@@ -35,7 +35,7 @@ exports.SubToolButton = Montage.create(Component, {
               boundObjectPropertyPath: "selected",
               oneway: false
             });
-
+            this.element.classList.add(this.data.id);
         }
     },
 
@@ -43,13 +43,9 @@ exports.SubToolButton = Montage.create(Component, {
         enumerable: false,
         value: function() {
             if(this._selected) {
-                this.element.classList.add( "buttonSelected" );
-                this.button.classList.remove( this.data.id + "Unpressed" );
-                this.button.classList.add( this.data.id + "Pressed" );
+                this.element.classList.add("active");
             } else {
-                this.element.classList.remove( "buttonSelected" );
-                this.button.classList.remove( this.data.id + "Pressed" );
-                this.button.classList.add( this.data.id + "Unpressed" );
+                this.element.classList.remove("active");
             }
         }
     },