java merge: ok
Merge branch 'master' of github.com:kevoree/kevoree-library