developer 1 show up
Merge remote-tracking branch 'TestApp/developer1' into developer2

Conflicts:
	TestApp/AppDelegate.h