Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

19 files changed, 28 insertions, 31 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 2c91ca13..4448e1f1 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
     {
         "codeCompleteCheck":{
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "codeComplete"}
             },
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 68f3be2b..ee314628 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -21,7 +21,7 @@
                 },
 
                 "breadCrumbButton": {
-                    "prototype": "montage/ui/button.reel",
+                    "prototype": "montage/ui/native/button.reel",
                     "properties": {
                         "element": {"#": "breadcrumb_button"}
                     },
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index e68d17c5..ebaa4ccd 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -20,7 +20,7 @@
             },
 
             "closeButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "close-btn"},
                     "identifier": "closeButton"
diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js
index 74129c2a..cfa86f76 100644
--- a/js/components/toolbar.reel/toolbar-button.js
+++ b/js/components/toolbar.reel/toolbar-button.js
@@ -6,7 +6,7 @@
 
 var Montage = require("montage").Montage,
     Component = require("montage/ui/component").Component,
-    Button = require("montage/ui/button.reel/button").Button;
+    Button = require("montage/ui/native/button.reel/button").Button;
 
 var ToolbarButton = exports.ToolbarButton = Montage.create(Button, {
     hasTemplate : {
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index ca447b8b..cf68520f 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -12,7 +12,7 @@
         <script type="text/montage-serialization">
         {
             "useFillColor": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useFillColor"},
                     "identifier": "useFillColor",
@@ -21,7 +21,7 @@
             },
 
             "useWebGL": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useWebGL"},
                     "identifier": "useWebGL",
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 5620eed8..579930f0 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -12,7 +12,7 @@
         <script type="text/montage-serialization">
         {
             "useStrokeColor": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useStrokeColor"},
                     "identifier": "useStrokeColor",
@@ -21,7 +21,7 @@
             },
 
             "useBorderWidth": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useBorderWidth"},
                     "identifier": "useBorderWidth",
@@ -49,7 +49,7 @@
             },
 
             "useBorderStyle": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useBorderStyle"},
                     "identifier": "useBorderStyle",
@@ -65,7 +65,7 @@
             },
 
             "useStrokeSize": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useStrokeSize"},
                     "identifier": "useStrokeSize",
@@ -94,7 +94,7 @@
             },
 
             "useWebGL": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useWebGL"},
                     "identifier": "useWebGL",
diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.html b/js/components/ui/label-checkbox.reel/label-checkbox.html
index 0efc7ae0..d39fca9b 100755
--- a/js/components/ui/label-checkbox.reel/label-checkbox.html
+++ b/js/components/ui/label-checkbox.reel/label-checkbox.html
@@ -20,7 +20,7 @@
         },
 
         "checkbox": {
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "checkbox"},
                 "checked": false
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index de11034b..0417fa3d 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.10.1.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"}
         ]
 }
\ No newline at end of file
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index c3209654..ff165f9a 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -12,7 +12,7 @@
     {
 
         "newFileDirectory": {