Wochenwechsel
Merge branch 'team1' of https://github.com/wase1012/awp_palaver.git into
team1

Conflicts:
	palaver2/src/main/java/de/bistrosoft/palaver/gui/view/Menueplan.java