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

Conflicts:
.idea/workspace.xml
workshop/www/js/controllers/EventListController.js