Updates to include results panel
Merge branch 'master' of https://github.com/cxmark/park-and-cycle-source

Conflicts:
	ui/scss/wrapper.scss