Working on friend to follower changes
Merge remote-tracking branch 'origin/master' into bala

Conflicts:
	ParseStarterProject/.DS_Store
	ParseStarterProject/Main.storyboard