Moved conflict icon priority down to not interfere with inprogress.
Merge branch 'build' of https://github.com/mconstantin/nuxeo-drive into build