Merge branch 'master' into brushtool

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

1 files changed, 0 insertions, 21 deletions

diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 19ede70a..55c37d02 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -116,27 +116,6 @@
    margin-left:43px;
 }
 
-
-.LockToolUp {
-    background-image: url("../images/optionsbar/link.png");
-    background-repeat:no-repeat;
-    width:17px;
-    height:18px;
-
-    margin-right:10px;
-}
-
-.UnLockToolUp {
-    background-image: url("../images/optionsbar/unlinked.png");
-
-    background-repeat:no-repeat;
-    width:17px;
-    height:18px;
-
-    margin-right:10px;
-}
-
-
 .cornerRadius {
     background-image: url("../images/optionsbar/rectangle/cornerRadius.png");
     background-repeat:no-repeat;