added TC test case for ticket 169
Merge branch 'origin/test'
updated the interpreter ui such that a color for highlight can be selected, a flag for selecting auto filtering of tock events have been added

overture sync [d6c738d9a544cb4a2924e07554d78c7ed603f0cb]

fixed bug https://sourceforge.net/p/compassresearch/tickets/159/
Merge remote-tracking branch 'origin/kel' into akm
Generalised parallelism now correctly merge the state when it ends