refactored until before collaboration tools
Merge branch 'master' of github.com:nuxeo/NuxeoTraining