developer 1 add name
Merge remote-tracking branch 'TestApp/developer2' into develop

Conflicts:
	TestApp/AppDelegate.h
developer 2 vanish