adds tokenization of user guid in generated url
Merge branch 'parse_user_guid' into au_fork

Conflicts:
	pages/edit.php