gallery separation between projects and persons
Merge branch 'master' of https://github.com/joernroeder/nm-website

Conflicts:
	app/app/modules/UserSidebar.coffee
	app/app/modules/UserSidebar.js