Fix my events bug
Merge branch 'dev' of https://github.com/shineview/shineview-web into dev