Serveur de *****
Serveur de ***** - 2
Merge branch 'master' of https://github.com/jonasoesch/NRJ

Conflicts:
	NRJ/src/main/java/ch/heigvd/nrj/rest/TestDataGeneratorResource.java