'merge' conflict #2
Merge branch 'develop' of
https://github.com/marcelamsler/miniprojectUI.git into develop

Conflicts:
	src/controller/WindowController.java
Merge branch 'develop' of
https://github.com/marcelamsler/miniprojectUI.git into develop