Merge pull request #22 from rguico/master

Add basic info popup; summarize bike/ped injuries in right pane
Changed wording on who got the injuries; added collType to popup; corrected icon so popup displays correctly
pulled master from upstream, then re-integrated; hopefully I didn't miss anything.