增加了work.java和house.java，修改了这两个表
add house and work,update the doc file
Merge branch 'john' of https://github.com/BiaoPro/community into biao

解决 Conflicts:
	app/views/Application/index.html