userId, eventId
Merge branch 'master' of https://github.com/6atty/ntu-3003-angular

Conflicts:
	app/templates/EventDetailView.html