Merge branch 'refs/heads/master' into binding

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

2 files changed, 7 insertions, 1 deletions

diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 0417fa3d..579264cb 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
         ]
 }
\ No newline at end of file
diff --git a/js/io/templates/files/html.txt b/js/io/templates/files/html.txt
index 3449ae39..33d50c49 100755
--- a/js/io/templates/files/html.txt
+++ b/js/io/templates/files/html.txt
@@ -10,6 +10,12 @@
                 <meta name="generator" content="Motorola Mobility Ninja">
                 
                 <style type="text/css">
+                        html, body {
+                                width: 100%;
+                                height: 100%;
+                                margin: 0;
+                                padding: 0;
+                        }
                 </style>
                 
         </head>