new logout
Merge branch 'html' of github.com:nbproject/nbproject into html

Conflicts:
	templates/web/base.html