Event refactor
Merge branch 'dev' of https://github.com/Xinchi/CU-App into dev