新版本html、js、css等文件添加
game system
API游戏搜索按排序输出
game html
修改图片地址为域名
game system
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/newui'
game css
game html
html
Merge branch 'liuhang' into newui

Conflicts:
	public/css/common.css
	public/js/btn-event.js
	public/js/page/stock.js
	public/ui/apps/draft.html
	public/ui/apps/edit.html
	public/ui/apps/gift.html
	public/ui/apps/history.html
	public/ui/apps/notpass.html
	public/ui/apps/pending.html
	public/ui/apps/stock.html
	public/ui/apps/unstock.html
	public/ui/change-password.html
	public/ui/system/channel.html
	public/ui/system/game-sort.html
	public/ui/system/shield-word.html
	public/ui/system/sort-tag.html
	public/ui/system/supplier.html
	public/ui/system/tags.html