fixed events and bugs
Merge branch 'feature/aurajs' of github.com:massiveart/husky into feature/aurajs