Merge branch 'develop'
Merging non-breaking changes from develop into master
fixed bug in angular event listeners