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

Conflicts:
	TestApp/TestApp/TESTAppDelegate.m
Merge branch 'feature-1'
removed features 1 and 2