Merge branch 'hotfix/cython' into develop

Conflicts:
	nextgen/bcbio/solexa/samplesheet.py
Merge branch 'hotfix/cython' into develop
Merge pull request #230 from SciLifeLab/develop

Develop - merge into master
Merge branch 'hotfix/skip_default_phix_filtering' of github.com:b97pla/bcbb
Merge conflict
Merge pull request #231 from b97pla/master

HOTFIX: Skip default phix-filtering of samples
Merge pull request #234 from SciLifeLab/develop

Develop
Merge branch 'develop' of https://github.com/SciLifeLab/bcbb into develop
Added specific version to download picard-tools. Solves conflict with Debian-med repository
Merge branch 'hotfix/picard-tools'
Merge branch 'hotfix/picard-tools' into develop
Added libsam-java to be compatible with our picard-tools
Merge branch 'hotfix/libsam-java' into develop
Added patch to work with both default Ubuntu/Debian picard-tools package and with jars directory. Thanks @chapmanb
Merge pull request #236 from guillermo-carrasco/develop

Support for default picard-tools