Merge remote-tracking branch 'origin/geoff' into develop

Conflicts:
	Assets/Scripts/MapUIManager.cs
Merge remote-tracking branch 'origin/geoff' into develop