map now has info windows
Merge branch 'master' into display_map_cards
Merge pull request #61 from red-admirals-2014/display_map_cards

Display map cards