aa
Merge branch 'branch_v1.0.0'

Conflicts:
	AppController.h