Saving progress to deal with ERTMS Academy problems
Merge branch 'Upstream/master'
Merge branch 'master'
Merge branch 'Upstream/master'

Conflicts:
	ErtmsFormalSpecs/doc/specs/subset-026/Kernel.efs_ns
	ErtmsFormalSpecs/doc/specs/subset-026/Kernel/ModeTransitions.efs_ns
EA_MODEL Modified EmergencyStops and the related things to handle Emergency Stop messages, and this created a need for a small change to a test and another part of the model because of a renamed variable
Merge branch 'Upstream/master'
EA_MODEL Modelled up to 3.10.2.2, but need to make some changes first
EA_MODEL Saving current state to work on something else
Merge branch 'Upstream/master'
EA_MODEL Changed the name of BrakeReason.Message to BrakeReason.OrderFromRBC
Merge branch 'Upstream/master'

Conflicts:
	ErtmsFormalSpecs/doc/specs/subset-026/Kernel.efs_ns
EA_MODEL Fixed error in merge
First try of correcting RBC contact information
Revert "First try of correcting RBC contact information"

This reverts commit b7616121d9794b94f0be6b126990810e8e945a06.
Bug fix on Guid handling (by Lolo)
Merge branch 'OpenETCS/master'
Bug fix #410: structure's state machines can be duplicated and correctly moved
EA_MODEL Finished implementing the EOA part of 3.10.2.2
EA_MODEL Changed type of various 'BrakeReason' variables to Kernel.BrakeReason
Bug fix #392 check variable default value type