update es_mapping
Merge branch 'tao' into sprint10