Found the missing changes to previous commit
Merge origin/master

Conflicts:
	src/it/dsmailand/abirechner/gui/ChoiceManagement.java