ui bugfix for events
update .gitignore
Merge branch 'master' into kingman