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

Conflicts:
	design/database/HouseRecordDBER.erm
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/messages.properties