elasticsearch

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>
Merge branch 'develop' of https://github.com/columby/mean.columby.com into develop