ElasticSearch
Merge branch 'elasticsearch'

* elasticsearch:
  ElasticSearch

Conflicts:
	Gemfile
	Gemfile.lock