Event UI update
Merge branch 'master' of https://github.com/Hivefication/Hive