Merge branch 'Upstream/master'
EA_TEST Test for 3.8.2.1
Merge branch 'Upstream/master'
EA_TEST Started test 3.8.5.1.2
EA_TEST Wrote actions for 3.8.5.1.2
EA_TEST Most of the test for 3.8.5.1.2
Merged modelling of emergency stops
Undid changes made to understand the test
EA_TEST wrote test for 3.8.5.1.2
EA_TEST Most of 3.8.5.1.2 done
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
EA_TEST A bit of work on 3.8.5.1.3
Merge branch 'Upstream/master'
EA_MODEL Made MA shortening be handled later in the cycle, added a rule to clean up after an MA shortening occurs
EA_TEST Tests for Reqs 3.8.5.1.3 and 3.8.5.1.4 completed
EA_TEST Prepare test for 3.8.5.2
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'