...
... fixed fuck of git... damn it
Merge branch 'master' of https://github.com/AStA-Wedel/Kasse.git

Conflicts:
	menatwork/database/model/kasse.mwb
	menatwork/database/model/kasse.mwb.bak
...
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	menatwork/database/model/kasse.mwb
	menatwork/database/model/kasse.mwb.bak