Current siteprop.m file
Merge commit 'aeeacf27c46a7ec56244f1258f448ed1d23a12a1'

Conflicts:
	siteprop.m