Add role-owner if the user is owner
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	public/s/components/user-area.js