Merge branch 'master' of https://github.com/jcondor/Mediateca.git