Merge branch 'dev'

qui/controls/windows/Popup.css

@@ -28,7 +28,7 @@
     border: none;
     cursor: pointer;
     float: right;
-    font-size: 20px;
+    font-size: 16px;
     height: 40px;
     line-height: 40px;
     position: absolute;