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, 3 insertions, 22 deletions

diff --git a/node_modules/components-data/anchor.json b/node_modules/components-data/anchor.json
index 04faf04d..028a759b 100644
--- a/node_modules/components-data/anchor.json
+++ b/node_modules/components-data/anchor.json
@@ -18,29 +18,10 @@
             "default": ""
         },
         {
-            "name": "hreflang",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "media",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "rel",
-            "type": "string",
-            "default": ""
-        },
-        {
             "name": "target",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "type",
-            "type": "string",
-            "default": ""
+            "type": "select",
+            "default": "_self",
+            "possibleValues": ["_self", "_blank", "_parent", "_top"]
         }
     ]
 }
\ No newline at end of file