fixed connectionstrings / removed db-files
merged with master