Refactor Event Firing on Controllers
Merge branch 'dev'