Major Sync, Foliage Incomingu
Merge branch 'master' of https://github.com/Team7-SoftEng/GateofGabethulu-game

Conflicts:
	BuildTest_Data/Managed/Assembly-UnityScript.dll
	BuildTest_Data/PlayerConnectionConfigFile
	BuildTest_Data/level0
	BuildTest_Data/mainData
	BuildTest_Data/sharedassets0.assets
	BuildTest_Data/sharedassets1.assets