InviteFriendsViewController updated
Merge branch 'master' of https://github.com/gavinc88/YANA

Conflicts:
	iOS/YANA/YANA.xcodeproj/project.pbxproj