Merge branch 'master' into development
[BUGFIX] emitter

- fix bug that all modules extending emitter share their listeners
Merge branch 'development'