changing nav
Merge branch 'master' of github.com:sigepberkeley/calsigep.com

Conflicts:
	app/src/modules/services/nav/nav-config.js
nav change