Minor updates
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	www/css/pitchpal.css
	www/index.html