Merge pull request #108 from isflorin/master

Merge pull
Added elastic search functionality
Merge pull request #109 from isflorin/dev

Dev