Merged changes, branch ready.
Merge pull request #49 from red-admirals-2014/display_map_cards

Merged changes, branch ready.