Merged dev into Databasefixes