新文件
Merge branch 'branch_v1.0.0' into branch_v1.1.1

Conflicts:
	AppController.h
Merge commit '7cfdcffa24d672b1716455dc7d25a580ec5ef294'
Merge branch 'branch_v1.1.1'