Basic aggregated view
Merge branch 'master' of https://github.com/hamutarto/SocialPoint

Conflicts:
	SocialPoint/SocialPoint/Data/Parse/ParseDataLoader.h
	SocialPoint/SocialPoint/Data/Parse/ParseDataLoader.m