Finished tweaking

A few pixels off due to the aforementioned scaling issue, but otherwise
perfect.
GAmeOverScene
menu!!!
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/CityView3.unity
some clean ups
back button bug fix
Talk later
Started on Soldier info display
Very Rough Soldier info view
Cleaned Enum
Fixed rough GUI
Soldier types
Added GameOver hook
mergefromMaster