Some more config stuff, got rid of the db-config.xml
Merge branch 'master' of https://github.com/PhenoImageShare/PhenoImageShare.git