update event.js
Merge branch 'develop' of github.com:cgle/bam-backend into develop
Merge branch 'webapp' into develop
isotope
rhyan
Merge remote-tracking branch 'origin' into angular

Conflicts:
	app/routes/api/event.js
	frontend/css/main.css
	frontend/index.html
	frontend/js/main.js