Merge origin/master

Conflicts:
	src/main/java/de/htwg/elferraus/controller/ElferRausController.java
	src/main/java/de/htwg/elferraus/entities/MainStack.java