update EventManager 2
Merge branch 'master' into nomodul
fix and develop jsp