stage managing, part1
Merge branch 'develop' of https://github.com/hauntedhill/SE-CAT into develop

Conflicts:
	src/main/java/de/hscoburg/evelin/secat/controller/AddItemController.java
	src/main/java/de/hscoburg/evelin/secat/controller/FilterItemController.java
	src/main/java/de/hscoburg/evelin/secat/controller/HandlungsfeldController.java
	src/main/java/de/hscoburg/evelin/secat/controller/MoveItemController.java
merge schiefgegangen
merge fix