Alvaro's work
Merge branch 'master' of https://github.com/johntu/ActivityPlanner