Merge pull request #4 from boylea/master

Ability to filter on shelters and or events
fix conflict
fix merge conflict
add nav to mobile layout
new marker icons again
hardly a merge really