Continued working on DatabaseManager
Merge branch 'master' into MyTreeImpl