Activities;
wtf podfile.lock;
Merge branch 'master' into feature/location-based-events

Conflicts:
	Caveman/Caveman.xcodeproj/project.pbxproj