Merge branch 'hotfix/fix_demux_parsing'
Merge pull request #193 from percyfal/master

Hotfix - fix incompatible parsing order for old samples. Fixes #192.
Merge branch 'master' of git://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/mayabrandi/scilifelab into develop