update es mapping
Merge branch 'sprint10' into mingshu

Conflicts:
	templates/04uberoutput_start.html
es_mapping update
Merge branch 'tao' into sprint10