Emergency commit
Merge branch 'master' of github.com:MyConference/MyConference-Memoria
Merge branch 'master' of github.com:MyConference/MyConference-Memoria