before decoupling
database class upgrade
Merge branch 'master' of https://github.com/mfrailis/DAS