profiimage update
update
update
Merge branch 'test'

Conflicts:
	MasterSpark for
iPad.xcodeproj/project.xcworkspace/xcuserdata/Mashiro.xcuserdatad/UserIn
terfaceState.xcuserstate
profiimageTask delete
update