Decorate the event the CAPI v1 genre
Merge branch 'master' of https://git.heroku.com/ft-next-beacon

Conflicts:
	models/events/click.js
	server/app.js