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

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-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
	js/preloader/Preloader.js

1 files changed, 24 insertions, 5 deletions

diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 3677d976..10b24ff4 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -11,9 +11,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Border-Radius",
+                "id": "njBorderRadius",
                 "selectorBase" : "border-radius-preset",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "border-radius": "100px",
                         "border" : "1px solid #333"
@@ -22,9 +22,9 @@ exports.stylePresets = {
             },
             {
                 "text": "Drop Shadow",
+                "id": "njDropShadow",
                 "selectorBase" : "drop-shadow",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)",
                         "border" : "1px solid #CCC"
@@ -33,9 +33,10 @@ exports.stylePresets = {
             },
             {
                 "text": "Fancy Box",
+                "id": "njFancyBox",
                 "selectorBase" : "fancy-box",
                 "rules" : [{
-                    "selectorSuffix" : "",
+                    "selectorSuffix": "",
                     "styles" : {
                         "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333",
                         "border" : "1px solid #FFF",
@@ -50,9 +51,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Italic",
+                "id": "njItalic",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "font-style": "italic"
                     }
@@ -60,13 +61,31 @@ exports.stylePresets = {
             },
             {
                 "text": "Text Shadow",
+                "id": "njTextShadow",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "text-shadow": "1px 1px 3px #333"
                     }
                 }]
+            },
+            {
+                "text": "White Sans-Serif",
+                "selectorBase" : "white-sans-serif",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "color": "#FFFFFF",
+                        "font-family": "helvetica,arial,sans-serif"
+                    }
+                },
+                {
+                    "selectorSuffix" : " h2",
+                    "styles" : {
+                        "color": "#C1C1C1",
+                        "font-family": "helvetica,arial,sans-serif"
+                    }
+                }]
             }]
     }]
 };
\ No newline at end of file