propper nav
Merge branch 'master' of github.com:veith/com.zuizz.pages

Conflicts:
	views/navbar/index.php