added clear and show options for citibike, bike shops, and accidents
fixed merge conflicts in user show html page and map.js