Single property view
Merge remote-tracking branch 'origin/master'

Conflicts:
	globaldatabase1.sql