Update Pop branch (yaml cleanup)
Merge branch 'jon' into pop
Merge branch 'jon' into pop
Updated POP branch
Web-ICE: Added red text to highlight out-of-range values
Merge branch 'jon' into pop

Conflicts:
	app.yaml
Pop branch landing page fixes
App.yaml fixes after "pop" merge
Fixed Landing Page CSS
App.yaml (added Data folder to skip_files)
Merge branch 'sprint10' into jon

Conflicts:
	app.yaml
Fixed app.yaml after merge
Merge branch 'sprint10' into jon
VVWM Setup cont. (Transfer file generator)
Merge branch 'sprint10' into jon
VVWM/PRZM5 UI fixes & VVWM REST Service setup
Merge branch 'sprint10' into jon

Conflicts:
	app.yaml
VVWM REST Service Setup (cont.)
Merge branch 'sprint10' into jon + VVWM / Bottle

Conflicts:
	REST/REST_local/bottle_local.py
Merge branch 'sprint10' into jon (History pages added)

Conflicts:
	stylesheets/scripts_swcprzm5.js