sd
Merge branch 'technology' of https://github.com/lnatus/JavaEE_HTW_Project into technology

Conflicts:
	Sources/build/classes/de/htw/saarland/eeproject/model/Building.class
	Sources/src/de/htw/saarland/eeproject/model/Building.java