fix reading of buildings.
Merge branch 'atlas'

Conflicts:
	CMakeLists.txt
	lib/settings.h
still fixing problems with new file version.