Fix wrong merge that broke classification labels.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/classifications.scala.html