update eventlistview
Merge branch 'angular' of github.com:cgle/bam-backend into angular
updating
fix conflicts