Merge branch 'john-3'
Changed setCoorColor to take world coordinates
..
Fix y minimap coordinates
healing
More Tooltips
..
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/ItinerantCity.unity
FastPathFinding
..
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	ProjectSettings/Physics2DSettings.asset
SmallChangesToSoldierMove
Added some open source sprites

Drawings would be cool, but these can stand in until then - from
OpenGameArt. The soldier sprite we’re using is free-ish (released for a
communities use, we can join the community and link)
Added more sound, music
Sound Work
Ah
MechanicsChange

There is now a cap on soldiers
City can now change direction while moving
Different Monster types spawn earlier and monsters that do spawn are of
the new highest level
Camera adjustments are better controlled now and there is a smaller
space to move within on the map

Needs Fixing:
Soldier Info GUI continues to give the null error reference even though
soldiers should be removed from the soldierselectedlist prior to death
Also cannot add xp to soldier current after it kills a monster
Monsters do not seem to die for some reason, or at least when there
health bar is at 0 they do not disappear from the screen but continue to
divide
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/ItinerantCity.unity
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/ItinerantCity.unity
...