Merge branch 'Upstream/master'
Merge branch 'OrangeBeltLinkingModelling'
Merge branch 'Upstream/master'
EA_MODEL Fixes due to tests failing
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
EA_MODEL Final requirements in 3.163.2.3 done
EA_MODEL modified StoreBaliseGroupMessage for requirement  3.16.2.3.3
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'

Conflicts:
	ErtmsFormalSpecs/doc/specs/subset-026/BTM/Linking.efs_ns
EA_MODEL Redesigned the handling of messages for 3.4.4.4.6.1
EA_MODEL Commented condition 66 and marked as implemented. Corrected N_TOTAL in the BTM tests.
EA_MODEL Cleaned up the linking consistency errors
EA_MODEL Fixed errors and BTM - Functional test
EA_MODEL Improved traceability, added comments and corrected flags
EA_MODEL Addeed traceability to 3.4.4.2.3.a)
Merge pull request #433 from JamesOakey/OBLinkingConsistencyModelling

Ok, merged. This pull request fully implements Linking (bug fix #8).