Merge branch 'master' of https://github.com/jonasoesch/NRJ

Conflicts:

	NRJ/src/main/java/ch/heigvd/nrj/services/crud/RoomConsumptionsFactsManager.java