Changes
iMerge branch 'master' of https://github.com/H4313/mapp

Conflicts:
	src/com/example/deephouse/EchangesModeleMaison.java
	src/com/example/deephouse/HouseActivity.java