All the work thus far.
Merge origin/master

Conflicts:
	js/iHousing.js