Merge remote-tracking branch 'origin/master'

Conflicts:
	design/database/HouseRecord.sql