ajout des annotations
Merge branch 'master' of ssh://git@github.com/H4313/util.git

Conflicts:
	utils/src/com/h4313/deephouse/housemodel/House.java
	utils/src/com/h4313/deephouse/housemodel/Room.java