Merge remote-tracking branch 'origin/issue17-simple_links' into develop

Conflicts:
	app/helpers/navigation_helper.rb
	app/views/shared/_navigation.html.haml
	config/routes.rb