Changed format of peak lists
Added files for reading SACLA format
Merge branch 'testing'