删除不需要在版本库的文件
图片上传，下一步编辑文章时的图片保存
--
Merge branch 'master' of https://github.com/ehovel/ehovel

Conflicts:
	admin/cache/a4/a4b50012e9a6c5200c40dc59b07a59c958d72207.txt
	modules/cms/classes/controller/admin/cms/ads.php
	modules/cms/views/ads/edit.php
	modules/resource/classes/controller/admin/resource.php
	modules/resource/classes/helper/resource.php
	modules/resource/views/resource_uploaddialog.php
	statics/js/uploadify/uploadify.css