Using the interface DatabaseManager instead of the SQLitemanager
Merge remote-tracking branch 'origin/master'