Set up initial json implicits
Add targeting criterion
Merge branch 'json-stuff'

Conflicts:
	app/controllers/Application.scala