同步标签，搭配接口
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/encodings.xml
	Home/Tpl/Public/js/CoverScroll/jquery.coverscroll.js
	Mini/Lib/Action/APIAction.class.php
同步标签，搭配接口