Phase1/feat/catan map

## This has the merged changes as well as the devCard and devCardTests removed.