conversion obj complete
Merge branch 'dev' of github.com:docdoku/docdoku-plm into dev