Map ajax call done
pulled master, solved conflicts
inserted missing end
Merge pull request #53 from red-admirals-2014/display_map_cards

Display map cards