Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package-lock.json
#	package.json
#	src/main/resources/js/admin/admin.min.js
#	src/main/resources/js/common.js
#	src/main/resources/js/common.min.js
#	src/main/resources/scss/admin.css
#	src/main/resources/scss/base.css
#	src/main/resources/scss/start.css
#	src/main/resources/skins/9IPHP/css/base.css
#	src/main/resources/skins/9IPHP/js/common.min.js
#	src/main/resources/skins/Andrea/css/base.css
#	src/main/resources/skins/Bruce/css/base.css
#	src/main/resources/skins/Bubble/css/base.css
#	src/main/resources/skins/Bubble/js/common.min.js
#	src/main/resources/skins/Casper/css/base.css
#	src/main/resources/skins/Casper/js/common.min.js
#	src/main/resources/skins/Community/css/base.css
#	src/main/resources/skins/Finding/css/base.css
#	src/main/resources/skins/Finding/js/common.min.js
#	src/main/resources/skins/Jane/css/base.css
#	src/main/resources/skins/Jane/js/common.min.js
#	src/main/resources/skins/Medium/css/base.css
#	src/main/resources/skins/Medium/js/common.min.js
#	src/main/resources/skins/NeoEase/css/base.css
#	src/main/resources/skins/NeoEase/js/common.min.js
#	src/main/resources/skins/Pinghsu/css/base.css
#	src/main/resources/skins/Pinghsu/js/common.min.js
#	src/main/resources/skins/favourite/css/base.css
#	src/main/resources/skins/i-nove/css/base.css
#	src/main/resources/skins/metro-hot/css/base.css
#	src/main/resources/skins/metro-hot/js/common.min.js
#	src/main/resources/skins/next/css/base.css
#	src/main/resources/skins/next/js/common.min.js
#	src/main/resources/skins/nijigen/css/base.css
#	src/main/resources/skins/nijigen/js/common.min.js
#	src/main/resources/skins/owmx-3.0/css/base.css
#	src/main/resources/skins/timeline/css/base.css
#	src/main/resources/skins/timeline/js/common.min.js
#	src/main/resources/skins/tree-house/css/base.css
#	src/main/resources/skins/yilia/css/base.css
#	src/main/resources/skins/yilia/js/common.min.js