Full paths in nav links.
Merge branch 'master' into facilities

Conflicts:
	templates/base.html