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

Conflicts:
	Gemfile.lock
	app/controllers/links_controller.rb
	app/helpers/navigation_helper.rb
	app/views/shared/_navigation.html.haml
Merge branch 'staging' into develop

Conflicts:
	Gemfile.lock
	app/controllers/links_controller.rb
	app/helpers/navigation_helper.rb
	app/views/shared/_navigation.html.haml