Categorization bugs fixed
Merge branch 'refs/heads/development' into bradley
Merge branch 'development' of https://github.com/B2MW/PersonalDriver into bradley

Conflicts:
	PersonalDriver/Main.storyboard
Updated logic that shows distance to pickup point