Merge origin/初始化

Conflicts:
	Apps/Common/Controller/CommonController.class.php