fixed search bug
color coded crime points
current Location button
merge conflicts
Merge pull request #36 from csmalin/merge-master

Merge master