Conflict not really solved....
New version with Bombardier branding
Merge branch 'master' of https://github.com/magnan/cordova-cef