Updates to navbar
Merge branch 'master' of https://github.com/ckubacak/piLab

Conflicts:
	templates/navbar.tpl
Deletions of old stuff