Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	public/routes/home.js
#	public/style/style.css
#	public/style/style.less

public/style/style.css

@@ -241,10 +241,15 @@ button.clearButton {
     float: right;
   }
 }
+<<<<<<< HEAD
 #subscribe-btn {
   float: right;
   visibility: hidden;
 }
 #escape-search-link {
   visibility: hidden;
+=======
+#bockmark-not-active {
+  visibility: visible;
+>>>>>>> origin/developer
 }

public/style/style.less

@@ -291,4 +291,10 @@ button.clearButton{
 }
 #escape-search-link{
 	visibility: hidden;
+
+#bockmark-not-active{
+    visibility: visible;
+}
+#bockmark-active{
+    //visibility: hidden;
 }