test2
Merge branch 'test2' into test1

Conflicts:
	CategoryDemo/CategoryDemo/AppDelegate.m