now displays run number
merged
Merge branch 'master' into aaron-dev
merged
can now any device with trace attribute for display
Merge branch 'master' into mws-dev