DivGame in conflict
game texts are now from the database
Merge branch 'MergingError' of https://github.com/EvelynHischier/CityBuilder into MergingError
DivGame set text from database