Merge branch 'feature/elasticsearch' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.slim
	config/routes.rb
	db/schema.rb
	lib/tasks/populate.rake