Bug fix #278
Rollback because it does not work for higher order functions
Created CurrentTerminal function
Tests corrected according to last changes in EURORADIO
Merge branch 'OpenETCS/master'