elasticsearch added
Merge branch 'master' of https://github.com/harboe/flsmidth

Conflicts:
	views/en/about/history.md