ES mapping files with corrected syntax. Sent by Owen.
Merge branch 'newdev' of https://github.com/k-int/KBPlus into newdev

Merging newdev locally