files uploaded for user + event
Merge branch 'angular' of github.com:cgle/bam-backend into angular

Conflicts:
	frontend/js/controllers.js
	frontend/views/event-content.html