xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	eqtl-mapping-pipeline/nb-configuration.xml