stuff
Merge branch 'master' of https://github.com/laureandrieux/MeetMeHack2014

Conflicts:
	workshop/www/partials/eventDetail.html