Merge branch 'Upstream/master'

Conflicts:
	ErtmsFormalSpecs/doc/specs/subset-026/EURORADIO.efs_ns
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
EA_MODEL Made to match Upstream/master.
EA_MODEL Changed values in BTM.Linking.LinkingReaction to match Messages.Q_LINKREACTION
Merge branch 'Upstream/master'

Conflicts:
	ErtmsFormalSpecs/doc/specs/subset-026/Kernel.efs_ns
	ErtmsFormalSpecs/doc/specs/subset-026/TestFrames/MA - Functional tests.efs_tst
Merge branch 'Upstream/master'
EA_MODEL Implemented the parts of 3.4.4 Linking that don't depend on linking consistency
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
EA_MODEL Modelled 3.16.2.3.1
EA_MODEL Requirements 3.4.4.4.6.b), 3.16.2.3.1.1, 3.16.2.3.2, and 3.16.2.3.2.1 implemented
Revert "EA_MODEL Requirements 3.4.4.4.6.b), 3.16.2.3.1.1, 3.16.2.3.2, and 3.16.2.3.2.1 implemented"

This reverts commit 9c699f191ac8fc6ccbc820f43f7e0ce94f707d27.
Revert "EA_MODEL Modelled 3.16.2.3.1"

This reverts commit f1363e77374517b0882fddda8875a7ec393d2ea9.
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
EA_MODEL Implemented comments and modified Linking.BGIdentityIsValid
Merge pull request #431 from JamesOakey/OrangeBeltLinkingModelling

Yes, exactly!