UI changes again and again...
Merge remote-tracking branch 'origin/develop' into develop
vince forever <3
Null Exception
Fixed nullPointerException in main window
Removed commented code in main class
Merge branch 'develop' into Jules'

Conflicts:
	src/org/imagine/screensframework/MainWindow.fxml
	src/org/imagine/supportingfiles/ImagineMainClass.java