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

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 7 insertions, 12 deletions

diff --git a/node_modules/components-data/toggle-button.json b/node_modules/components-data/toggle-button.json
index e85dd72a..a4f1c246 100644
--- a/node_modules/components-data/toggle-button.json
+++ b/node_modules/components-data/toggle-button.json
@@ -6,31 +6,26 @@
     "name": "ToggleButton",
 
     "properties": [
-
         {
             "name": "pressed",
             "type": "boolean",
             "default": "false"
         },
         {
-            "name": "unpressedLabel",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "pressedLabel",
+            "name": "label",
             "type": "string",
-            "default": ""
+            "default": "Toggle"
         },
         {
-            "name": "pressedClass",
+            "name": "unpressedLabel",
             "type": "string",
-            "default": "pressed"
+            "default": "Off"
         },
         {
-            "name": "label",
+            "name": "pressedLabel",
             "type": "string",
-            "default": ""
+            "default": "On"
         }
+
     ]
 }
\ No newline at end of file