event edit
Merge branch 'angular' of https://github.com/cgle/bam-backend into angular

Conflicts:
	frontend/js/bamApp.js