Updated server/Play
Merge branch 'master' of https://github.com/Cryslo/EMSRisicoStage

Conflicts:
	EMSFireTrainer/Assembly-UnityScript-Editor-firstpass-vs.unityproj
	EMSFireTrainer/Assembly-UnityScript-Editor-firstpass.unityproj

EMSFireTrainer/Assets/Resources/Prefabs/Scene_1_Prefabs/fireSprite_01.pr
efab