Merge pull request #75 from tiger-swallowtails-2014/delete_buttons

Delete buttons
fixed eventlistener bug