Renamed DAO to Catalogue.
Merge branch 'master' of https://github.com/ehannes/webapp.git