some stuff
Merge branch 'master' of https://github.com/krischanstapelfeldt/qm/

Conflicts:
	src/de/globalposeidon/Qualitaet/model/ApartmentTableModelTop.java