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