Reorganized again
Merge branch 'master' of github.com:MyConference/MyConference-Memoria