Categories integrated
Merge branch 'master' of https://github.com/benna100/CityWalk