Merge branch 'master' of https://github.com/Aganius/Agenda.git