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

Conflicts:
	www/js/controllers.js
	www/templates/main/menu.html