Added more unit tests
Merge branch 'master' of https://github.com/bponnaluri/Clash-Of-Empires-App

Conflicts:
	src/client/view/panels/GameDisplay.scala
	src/server/controller/playerControls/HumanPlayer.java
	src/server/model/mapData/GameMap.scala
	src/server/model/mapData/MapGen.scala
	src/server/model/mapData/ResourceReader.scala
	src/server/model/mapData/TerrainType.scala
	src/server/model/mapData/TerritoryPicker.scala
	src/server/model/playerData/HexGen.scala
	src/server/model/playerData/Region.scala