Test Scenario #28
Merge branch 'Training2_Branch'

Conflicts:
	Training/Table/Parameters.table