update css styles to pick up everything correctly
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/incremental.scala.html