Merge branch 'resortplottest' into 71-tests-for-conversion-db

.../SuccedingImport/Oscilloscope/Keysight/20180606_005_4.csv

...ingImport/Oscilloscope/KeysightBinary/keysight_binary.bin

...Data/SuccedingImport/Oscilloscope/KeysightFra/scope_1.csv

...uccedingImport/SpectrumAnalyzer/RhodeSchwarz/2010830P_001

...uccedingImport/SpectrumAnalyzer/RhodeSchwarz/2010830P_003

...ccedingImport/SpectrumAnalyzer/RhodeSchwarz/2010830RD_001

...ccedingImport/SpectrumAnalyzer/RhodeSchwarz/2010830RD_002

...ccedingImport/SpectrumAnalyzer/RhodeSchwarz/2010830RD_003

...ccedingImport/SpectrumAnalyzer/RhodeSchwarz/2010830RD_004

...uccedingImport/SpectrumAnalyzer/RhodeSchwarz/20180605_001

...uccedingImport/SpectrumAnalyzer/RhodeSchwarz/20180605_002

...uccedingImport/SpectrumAnalyzer/RhodeSchwarz/20180822_004

.../SpectrumAnalyzer/RhodeSchwarz/FSV-4_multitrace_comma.DAT

...rt/SpectrumAnalyzer/RhodeSchwarz/FSV-4_multitrace_dot.DAT

...SpectrumAnalyzer/RhodeSchwarz/FSV-4_singletrace_comma.DAT

...t/SpectrumAnalyzer/RhodeSchwarz/FSV-4_singletrace_dot.DAT

...pectrumAnalyzer/RhodeSchwarz/FSVR-7_singletrace_comma.DAT

.../SpectrumAnalyzer/RhodeSchwarz/FSVR-7_singletrace_dot.DAT

.../SuccedingImport/SpectrumAnalyzer/RhodeSchwarz/fsvr-7.DAT

...cedingImport/SpectrumAnalyzer/RhodeSchwarz/multitrace.DAT