Someone forgot to fix a merge conflict in FE/app.js, and I had to extend some integrationtests (and a window wasn't closing)

Signed-off-by: Wim Tibackx <wim.tibackx@student.kdg.be>