massive commit, major changes to events controller, and also merged in mozilla/webmaker upstream
Merge branch 'master' of github.com:AmoebaConsulting/webmaker.org-compound
merging in upstream public/js/main.js