scores, titles
Merge branch 'master' of https://github.com/Blechfalke/CityBuilderProd

Conflicts:
	view/Scores.php