Changes to be committed:
	modified:   tasks/pipeline.js
	modified:   views/layout.ejs
	modified:   views/templates/DownloadFileIrods.ejs
Merge branch 'master' of https://github.com/biolab-unige/xtens-app

Conflicts:
	tasks/pipeline.js
	views/layout.ejs
	views/templates/DownloadFileIrods.ejs