developer 2 add ST
Merge remote-tracking branch 'TestApp/developer2' into develop

Conflicts:
	TestApp/AppDelegate.h
developer 2 vanish
Merge remote-tracking branch 'TestApp/developer2' into developer1

Conflicts:
	TestApp/AppDelegate.h