Fix mixed-up DB mapping
Merge branch 'master' of github.com:mansam/senior-project