Whitespace changes
Show notifications count next to name
Merge branch 'master' into kingman

Conflicts:
	base/templates/navbar.html