Merge branch 'master' of https://github.com/xiaozhujun/houseRent

Conflicts:
houseRent/Tpl/House/houseInfo.tpl