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