testng
Merge remote-tracking branch 'origin/master' into eric

Conflicts:
	ParseStarterProject.xcodeproj/project.xcworkspace/xcuserdata/eoh.xcuserdatad/UserInterfaceState.xcuserstate
	ParseStarterProject/User.h