r
Merge branch 'master' of https://github.com/SuperApple/iHouse.git

Conflicts:
	gen/com/fynas/ihouse/R.java