Bump stories in an event
Fix merge conflicts
Merge branch 'events' of github.com:guardian/frontend-admin into events-ui

Conflicts:
	app/views/events.scala.html
	public/javascripts/models/article.js
	public/javascripts/models/event.js