always vince...
End of the day
/Users/Corozyf/Documents/develop/Imagine/src/org/imagine/screensframework/application.css
/Users/Corozyf/Documents/develop/Imagine/src/org/imagine/screensframework/MainWindow.fxml
Merge branch 'develop' into Jules'

Conflicts:
	src/org/imagine/screensframework/MainWindow.fxml
	src/org/imagine/supportingfiles/ImagineMainClass.java
A WTF conflict has been resolved
modify un truc
Merge branch 'Jules'' into develop