first response from parse
Merge branch 'master' of https://github.com/hamutarto/SocialPoint

Conflicts:
	SocialPoint/SocialPoint.xcodeproj/project.pbxproj

SocialPoint/SocialPoint.xcodeproj/project.xcworkspace/xcuserdata/hamutar
to.xcuserdatad/UserInterfaceState.xcuserstate

SocialPoint/SocialPoint.xcodeproj/xcuserdata/hamutarto.xcuserdatad/xcdeb
ugger/Breakpoints_v2.xcbkptlist
merge complete