Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

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

1 files changed, 6 insertions, 1 deletions

diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index 9c9c4ac8..8edbedd2 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -90,7 +90,7 @@
                 "uri":"js/io/templates/files/banner.txt",
                 "type":"file",
         "fileExtension":".html",
-        "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"]
+        "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280", "728x90"]
         },
     
     "120x600":{
@@ -123,6 +123,11 @@
         "uri": "336x280",
         "type":"file"
     },
+    "728x90":{
+        "name": "Leaderboard",
+        "uri": "728x90",
+        "type":"file"
+    },
     
     "js/io/templates/files/animation.txt":{
                 "name":"Animation",