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

# Conflicts:
#	src/main/resources/skins/Finding/js/common.min.js
#	src/main/resources/skins/Jane/js/common.min.js
#	src/main/resources/skins/Medium/js/common.min.js
#	src/main/resources/skins/NeoEase/js/common.min.js
#	src/main/resources/skins/Pinghsu/js/common.min.js
#	src/main/resources/skins/metro-hot/js/common.min.js
#	src/main/resources/skins/next/js/common.min.js
#	src/main/resources/skins/nijigen/js/common.min.js

src/main/resources/scss/_reset.scss

@@ -23,7 +23,7 @@ html {
 
 body {
   margin: 0;
-  font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif ;
+  font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif ;
   font-size: 14px;
   background-color: #fff;
   -webkit-font-smoothing: antialiased;
@@ -123,7 +123,7 @@ textarea {
   margin: 0;
   font-size: 100%;
   vertical-align: middle;
-  font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
+  font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
   outline: none;
 }
 
@@ -172,4 +172,4 @@ svg {
 
 blockquote {
   margin: 0;
-}
+}
\ No newline at end of file

src/main/resources/skins/Jane/css/base.scss

@@ -425,7 +425,7 @@ a {
     box-sizing: border-box;
     font-size: 14px;
     outline: none;
-    font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
+    font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
   }
 
   button {

src/main/resources/skins/yilia/css/base.scss

@@ -53,7 +53,7 @@ html {
 body {
   height: 100%;
   max-height: 100%;
-  font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
+  font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
   letter-spacing: 0.01rem;
   font-size: 100%;
   line-height: 1.75em;
@@ -89,7 +89,7 @@ h4, h5, h6 {
   -o-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;
   color: #666;
   line-height: 1.15em;
-  font-family: "Open Sans", "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
+  font-family: "Open Sans", "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
   text-rendering: geometricPrecision;
 }
 
@@ -194,7 +194,7 @@ mark {
 
 code, tt {
   padding: 1px 3px;
-  font-family: Inconsolata, monospace, "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
+  font-family: Inconsolata, monospace, "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
   font-size: 0.85em;
   white-space: pre-wrap;
   border: #E3EDF3 1px solid;
@@ -352,7 +352,7 @@ pre code, pre tt {
   box-sizing: border-box;
   font-size: 14px;
   outline: none;
-  font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
+  font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
 }
 
 .form textarea {