Some renaming.
Merge branch 'master' of github.com:pitte/CityUnderSiege