Added elasticsearch-1.2.1
Merge branch 'elasticsearch'