minor fix
Merge remote-tracking branch 'origin/master'

Conflicts:

	AMT_API_project/src/main/java/ch/heigvd/amt/amt_api_project/services/TestDataManager.java