fix references to react-nested-router to be simply react-router

also cleaned up use of Link and removed unused this.Router and browserify packages
Merge branch 'master' into design/54-refactor-header-layout

Conflicts:
	application/ui/components/navigation/main-nav.jsx
	application/ui/layouts/header.jsx