Merge branch 'master' of https://github.com/chiguire/nttcitygenerator

Conflicts:
	src/nntcity/cityobjs.h