aa
Merge branch 'branch_v1.0.0' into branch_v1.1.1

Conflicts:
	AppController.h