details
Merge branch 'develop' of github.com:kwielogorski/pitchpal into develop

Conflicts:
	www/css/pitchpal.css
	www/js/app.js
	www/templates/main/menu.html
fix