events views
Merge branch 'webapp' of https://github.com/cgle/bam-backend into webapp

Conflicts:
	frontend/js/controllers.js