relationship part-room
Merge branch 'master' of https://github.com/jonasoesch/NRJ

Conflicts:
	NRJ/src/main/java/ch/heigvd/nrj/model/Apartment.java
Merge branch 'master' of https://github.com/jonasoesch/NRJ