Merge pull request #51 from ryanricig/master

event templates, bundle icon, scroll change
several changes from list