Merge branch 'master' of https://github.com/elan2wang/iHome

Conflicts:
	public/ui/pages/houseDetailContent.html