常规修改
Merge branch 'master' of https://github.com/shoy160/Singer

Conflicts:
	build/css/base.min.css
	build/css/h-pager.min.css
	build/css/pager.min.css
	build/css/reset.min.css
	build/css/respond.min.css
	build/plugs/Jq-common.min.js
	build/plugs/Jq-form.min.js
	build/plugs/Jq-pager.min.js
	build/plugs/class.min.js
	build/plugs/hTemplate.min.js
	build/plugs/slider.min.js
	build/plugs/stars.min.js
	build/seed.js
	build/seed.min.js
	src/seed/src/string.js