Merge branch 'develop' into honeybooboo

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/_header.html.erb
	db/schema.rb
linked omnniauth with icons
Merge branch 'honeybooboo' of https://github.com/scholarslab/prism into honeybooboo

Conflicts:
	Gemfile.lock
	app/views/devise/_links.erb
	app/views/layouts/_header.html.erb