first pass at linking the stories together
refactor
Merge branch 'master' into link-up-stories

Conflicts:
	app/controllers/Application.scala
	app/models/NewsItem.scala