Merge browser action CSS changes from master

Fix browser action bug, more pin_locked->pinLocked

Conflicts:

	browser_action/browser_action.css

browser_action/browser_action.css

@@ -59,13 +59,7 @@ x-pin > div.x-pin-fields > input {
 }
 
 #pin-entry {
-/*    display:none;*/
-}
-
-#pin-entry input {
-    font-size:48pt;
-    width:50px;
-    height:70px;
+    display:none;
 }
 
 #signup-nag {