更新
Merge branch 'master' of https://github.com/shenhuyong/AzerCMS into ghbb

Conflicts:
	core/acp_inc/functions.php