Added some TraceView code back
Restored TraceView in new format
Merge branch 'kwikskope_fix' into kwik