testStub mainMapViewController
Merge branch 'master' of https://github.com/hamutarto/SocialPoint

Conflicts:
	SocialPoint/SocialPoint.xcodeproj/project.pbxproj
	SocialPoint/SocialPoint/AppDelegate.m