Updates
Merge branch 'master' of https://github.com/DavidSpriggs/hackathon_2-18-2014

Conflicts:
	views/activities/events/index.jade