fea
Merge branch 'new2' into develop

Conflicts:
	test/test.xcodeproj/project.pbxproj
	test/test.xcodeproj/project.xcworkspace/xcuserdata/vunguyen.xcuserdatad/UserInterfaceState.xcuserstate