Merge branch 'sufia' into hydranorth

Conflicts:
	Gemfile
	config/database.yml
	config/locales/blacklight.en.yml
	db/schema.rb