nav updates styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	BaseHTML/js/functions.js