yaml update
update es_mapping epa skin shift
Merge branch 'tao' into sprint10
update es mapping
Merge branch 'sprint10' into mingshu

Conflicts:
	templates/04uberoutput_start.html
es_mapping update
hidden model genee with rest bottle service
Merge branch 'tao' into sprint10
update genee
sprint10 and app.yaml update
webice xml,gif,css
app.yaml update
boto install
Merge branch 'tom' into sprint10
fix batch
fix batch
add batch temp back
earthworm begins
earthworm adds
Merge branch 'mingshu' into sprint10