updated sidebar bio
Merge branch 'master' of https://github.com/joernroeder/nm-website

Conflicts:
	app/app/templates/security/editor-sidebar-user.html