Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

1 files changed, 0 insertions, 27 deletions

diff --git a/node_modules/montage/ui/skeleton/range-input.reel/range-input.css b/node_modules/montage/ui/skeleton/range-input.reel/range-input.css
deleted file mode 100644
index 43bf5b2c..00000000
--- a/node_modules/montage/ui/skeleton/range-input.reel/range-input.css
+++ /dev/null
@@ -1,27 +0,0 @@
- div.slider {
-   display: inline-block;
-   border-radius: 4px;
-   position: relative;
-   height: 8px;
-   background-color: #556270; 
-   border: 1px solid #aaa;
-   cursor: default;
-}
-.slider-handle {
-    top: -0.6em;
-    position: absolute;
-    z-index: 2;
-    cursor: pointer;
-    
-    width: 1.2em;
-    height: 1.2em;
-    background-color: #ddd;
-    color: #fff;
-    padding: 4px;
-    border: 1px solid #333;
-    border-radius: 20px;
-}
-
-.slider-handle:hover {
-    background-color: #999;
-}
\ No newline at end of file