Merge branch 'master' of github.com:cooper-lyt/HMPLAT

Conflicts:
	design/database/HouseRecordDBER.erm
Merge branch 'master' of github.com:cooper-lyt/HMPLAT

Conflicts:
	design/database/HouseRecordDBER.erm