Move invite/transfer links into roster
Merge branch 'master' into roster-links

Conflicts:
	src/ploneintranet/workspace/browser/templates/roster-edit.pt
Layout of roster page