ship geo config manager
Merge branch 'master' of github.com:ShipSoft/FairShip

Conflicts:
	macro/run_simScript.py