Saving progress to deal with ERTMS Academy problems
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'
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
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
Bug fix #392 proper fix, previous was incorrect
EA_MODEL Added design choice for changes to EOA
EA_MODEL Fixed default values
EA_MODEL Changed the range of MessageTypes.Time and added conversion finctions for time
EA_MODEL Linked EndOfMovementAuthority() to the design choice