petite modif
Merge branch 'master' of https://github.com/FlavienKnuchel/Teaching-COMEM-MWS

Conflicts:

	RESTBackEndSkeleton/src/main/java/ch/heigvd/skeleton/rest/PopulateDatabase.java