Top nav update
Nav update
Logo update
Merge branch 'refs/heads/master' into cclark

Conflicts:
	views/scss/base/_type.scss
updated to use color vars