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

Conflicts:
	www/js/app.js
	www/templates/main/details.html
	www/templates/main/mapSearch.html