Dependency refresh.
Make sure Database.setActive(...) is set correctly during startup.
Merge pull request #41 from pferraro/3.0

Make sure Database.setActive(...) is set correctly during startup