添加图集模块
Merge branch 'master' of https://github.com/cybrobin/iwangame.com

Conflicts:
	asset/js/ckeditor/lang/zh-cn.js
	module/back/article.php
	template/back/category.tpl
	template/back/news.tpl