fixes integration stuff + add cancel mise en edition
several fixes
merged latest refactoring with small fixes
adapted to new login service
Merge pull request #6 from freddylimpens/master

fixes integration stuff + add cancel mise en edition