merge
Merge branch 'master' of https://github.com/KreMat/DBS_FH_Verwaltung.git

Conflicts:
	src/at/technikum/wien/bif12/dbs/verwaltung/dao/impl/DatabaseHandlerImpl.java