merging master

CMakeLists.txt

debian/changelog

debian/control

debian/libpappsomspp-qt4.symbols

debian/libpappsomspp-qt5.symbols

src/CMakeLists.txt

src/pappsomspp/grouping/grppeptideset.cpp

src/pappsomspp/grouping/grpsubgroupset.cpp

src/pappsomspp/peptide/peptidenaturalisotopeaverage.cpp

src/pappsomspp/peptide/peptidenaturalisotopelist.cpp

src/testwin64/CMakeLists.txt

src/testwin64/test.cpp

test/test_peptidenaturalisotopelist.cpp

win64/Toolchain-mingw64.cmake