Manual merge of master into xovis branch

@tim-moody Why did you decide to delete the db on every ansible run? If there is already data in the database, that data would be lost.