fix a typo
move all events from template to view class
Merge branch 'master' into gh-pages
update dist