Ian - getUnits method

Replaced the getMarines method in the map class with the getUnits
method.
Made units in deploymentAreas a List, rather than an ArrayList.
Merge branch 'master' of https://github.com/UnofficialSpaceHulkTeam/UnofficialSpaceHulk