added feature 2
Merge branch 'feature-2' into feature-1

Conflicts:
	TestApp/TestApp/TESTAppDelegate.m