Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 0 insertions, 40 deletions

diff --git a/js/components/button.reel/button.css b/js/components/button.reel/button.css
deleted file mode 100755
index f50a9873..00000000
--- a/js/components/button.reel/button.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-
-.button {
-    border:none;
-    cursor:default;
-    text-align:center;
-    -webkit-user-select:none;
-    opacity:0.8;
-    display:table-cell;
-    vertical-align:middle;
-    width:100%;
-    height:100%;
-    background-color:#333333;
-    color:white;
-}
-
-.button:hover
-{
-    opacity:1;
-}
-
-.button:active
-{
-    outline:solid 1px black;
-}
-
-.button.on
-{
-    background-color: #333333;
-}
-
-.button.off
-{
-    background-color: #cccccc;
-    color:black;
-}
\ No newline at end of file