abg1
Merge branch 'master' of github.com:Taper21/SBC

Conflicts:
	src/alternativ/domain/Lebkuchen.java