fix ViewEvent bug
Merge branch 'develop' of https://github.com/shidh/CSSA into develop