Imac Update
Merge branch 'master' of https://github.com/Cryslo/EMSRisicoStage

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