Navbar updated
Merge branch 'master' of https://github.com/ThunderForce/BeeVote

Conflicts:
	beevote/templates/topics-layout.html