More storage logic
kleine fix
Merge branch 'developst' of https://github.com/remynaps/containingController into developst
l
Merge branch 'developst' into nieuwinit

Conflicts:
	src/main/java/org/nhl/containing/cranes/Crane.java