Added terrain types
Terrain types rendered propperly
Semi sensical terrain choices
Merge branch 'terrainTypes' into develop