We had some errors with the Git-Merge and had to fix them, now we have a
problem with the application exit but we are working on that.