dynamic fog code
merge
Merge branch 'master' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM

Conflicts:
	Assembly-UnityScript-firstpass.pidb
	Assembly-UnityScript.pidb
	Assets/Scenes/Scene_Campaign.unity

increased cyclops and ram rigidbody mass and angular drag
Merge branch 'master' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM

Conflicts:
	Assembly-CSharp-Editor.pidb
	Assembly-CSharp-firstpass.pidb
	Assembly-UnityScript-firstpass.pidb
	Assembly-UnityScript.pidb
	Assets/PreFabs/CyclopsTest.prefab
	Assets/PreFabs/batteringRamTest.prefab
	Assets/Scenes/Scene_Campaign.unity
	GoldenCityGameMain4_16_9_23AM.userprefs
set up LION to use new pathfinding
Merge branch 'master' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM

Conflicts:
	Assets/Scenes/Scene_Campaign.unity