本地commit

1
Merge branch 'master' of https://github.com/ehovel/ehovel

Conflicts:
	modules/resource/classes/controller/admin/resource.php