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

Conflicts:
	EMSFireTrainer/EMSFireTrainer.userprefs