user property editing
Merge branch 'master' of https://github.com/MattArnold/penguicontrax into HEAD
Merge remote-tracking branch 'origin/master' into sandcat

Conflicts:
	penguicontrax/templates/macros.html