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

public/style/style.css

 	margin-top: 30%;
 	font-size:140%;
 }*/
-
-
-.om-searchbar input.input{
-    border-radius: 0 !important;
-    box-shadow: none !important;
-	border-right: white;
-}
-
-button.clearButton{
-    border-radius: 0 !important;
-    background-color: white;
-    margin-left: -5px;
-    border-color: #dbdbdb;
-    border-left: white;
-
-}
-
-
-
+.om-searchbar input.input {
+  border-radius: 0 !important;
+  box-shadow: none !important;
+  border-right: white;
+}
+button.clearButton {
+  border-radius: 0 !important;
+  background-color: white;
+  margin-left: -5px;
+  border-color: #dbdbdb;
+  border-left: white;
+}

public/style/style.less

 	font-size:140%;
 }*/
 
+.om-searchbar input.input{
+    border-radius: 0 !important;
+    box-shadow: none !important;
+	border-right: white;
+}
+
+button.clearButton{
+    border-radius: 0 !important;
+    background-color: white;
+    margin-left: -5px;
+    border-color: #dbdbdb;
+    border-left: white;
+
+}
+