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

# Conflicts:
#	src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
#	src/main/java/fr/univlille/sae/classification/model/LoadableData.java
#	src/test/java/fr/univlille/sae/classification/model/ClassificationModelTest.java