Merge branch 'master' into dev

editor/js/libs/app/index.html

@@ -19,7 +19,7 @@
 			padding: 8px;
 			color: #555;
 			background-color: #fff;
-			opacity: 0.7;
+			opacity: 0.5;
 		}
 		#edit:hover {
 			cursor: pointer;