huh
merged
Merge branch 'master' of github.com:mgentili/Veritasks

Conflicts:
	templates/properties.php