uploadfile
Merge branch 'master' of https://github.com/biolab-unige/xtens-app

Conflicts:
	bower.json
	tasks/pipeline.js
	views/layout.ejs