Merge branch 'develop' of https://github.com/CityGenerator/Megacosm-Generator into multiflag

Conflicts:
	data/npc.data
Merge branch 'multiflag' into develop
fixed a mistake I made merging data/npc.data