Update nav to use bootstrap classes.
Merge branch 'master' into add-s3-to-user

* master:
  Update nav to use bootstrap classes.

Conflicts:
	app/views/layouts/_navigation.html.erb
	app/views/layouts/application.html.erb