Merge remote-tracking branch 'central/master'
Merge conflicts
Merge conflicts, mostly from my whitespace removals
Merge pull request #209 from SciLifeLab/develop

Develop
Merge pull request #210 from SciLifeLab/develop

Develop
Merge pull request #212 from SciLifeLab/develop

Develop
Merge pull request #217 from SciLifeLab/develop

Develop
Merge pull request #220 from SciLifeLab/develop

Develop
added bash script for sending runs to swestore
Merge pull request #221 from mayabrandi/develop

Develop
added option to print name conversion table, fixed bug with missing prep information
Merge pull request #222 from SciLifeLab/develop

Develop
resused existing code for name-table creation. changed CustomerID to SubmittedID
Merge branch 'develop' of github.com:SciLifeLab/scilifelab into develop
Merge pull request #223 from b97pla/develop

Develop
Merge pull request #224 from SciLifeLab/develop

Develop
Merge pull request #225 from mayabrandi/develop

Develop
Merge pull request #226 from SciLifeLab/develop

Merging maya hotfixes
removed default value for num_cores
Merge pull request #228 from b97pla/develop

removed default value for num_cores