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, 1 insertions, 1 deletions

diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json
index 6422b58d..66501166 100755
--- a/node_modules/montage/package.json
+++ b/node_modules/montage/package.json
@@ -1,6 +1,6 @@
 {
     "name": "montage",
-    "version": "0.3.1",
+    "version": "0.7.0",
     "description": "A UI Framework",
     "main": "montage",
     "overlay": {