More event links with new odi_content_models gem
Merge branch 'refs/heads/master' into event-links

Conflicts:
	Gemfile.lock
Update content models again to get news fix
Merge pull request #42 from theodi/event-links

More event links