update es_mapping
Merge branch 'tao' into sprint10
update es_mapping
clean es_mapping