made changes to fit new database
Merge branch 'master' of https://github.com/darpell/monica.git