aaa
Merge branch 'master' of https://github.com/Jing-Zong-Chang/ios-test

Conflicts:
	ios-test-proj/ios-test-proj/AppDelegate.h