fix event conflic
Merge branch 'dev' of github.com:fex-team/kityminder into dev