File additions to synchronize with downstream
Downstream updates
Fixed failing tests
Merge branch 'R2.0' into wildflow-pwm4

Conflicts:
	Gemfile.lock
	app/views/layouts/navigation/_top_navigation_bar.html.haml
	app/views/research_topics/index.html.haml
	config/initializers/pprn.rb
Merge remote-tracking branch 'upstream/wildflow-pwm4' into 2-0-dev

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/main.js.coffee
	app/views/layouts/_flash_messages.html.haml
	app/views/layouts/admin.html.haml
	config/initializers/assets.rb
	config/routes.rb