Merge remote-tracking branch 'refs/remotes/origin/master' into matiasmennecart

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
#	src/main/java/fr/univlille/sae/classification/controller/DataStageController.java
#	src/main/java/fr/univlille/sae/classification/view/DataStageView.java
#	src/main/java/fr/univlille/sae/classification/view/MainStageView.java