Two new houses
Merge remote-tracking branch 'John-Candlebury/houses'

Conflicts:
	data/json/item_groups.json