maqueta
Merge branch 'master' into develop
fixes to album names, delete files unneded
fixes
init php
Merge branch 'develop'