cleanup
Merge branch 'master' of git.creatis.insa-lyon.fr:desk
proxy : redirect root url to /demo