only display email in topbar when user is logged in
Merge branch 'master' of github.com:DefactoSoftware/BKOUpload

Conflicts:
	app/views/layouts/application.html.erb