Standardizing event names, Controller implementation, dispatch events
Merge branch 'master' into gh-pages