Pop Branch Created: app.yaml switched to Pop-version
Merge branch 'jon' into pop

Conflicts:
	app.yaml
Merge branch 'jon' into pop

Bringing up to date with End of Sprint5 / Beginning of Sprint 6

Conflicts:
	app.yaml
Pop branch is now GAE application: Untertool and Version: Master in app.yaml
Merge branch 'sprint8' into pop - I hope this goes OK....

Conflicts:
	app.yaml
app.yaml conflict resolution
earthworm batch
Merge branch 'mingshu' into sprint10
earthworm batch update

bug fix
WEB-Ice Output tweak
Making app.yaml current
Merge branch 'jon' into pop: Added Web-ICE to Untertool

Conflicts:
	stylesheets/style_pop.css
YAML stuff (minor)
Yaml (minor)
Changed app.yaml verison to 'sprint10'
Pop branch tweaks (nav bar, colors)
Merge branch 'jon' into sprint10
Merge branch 'tao' into sprint10
Merge branch 'tao' into sprint10