Support highlight option on search
Merge branch 'master' of psoto:Exartu/Exartu-Elasticsearch