fix conflict
fixes
Merge branch '6.3.x' of https://github.com/bonitasoft/bonita-studio.git into 6.3.x
update splash screen