Major navbar commit

redid navbar include
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php