Merge branch 'master' of https://github.com/12sm/sidbernstein

Conflicts:
	templates/sidenavbar.php
sidenav
Merge branch 'master' of https://github.com/12sm/sidbernstein