Replace a number of @defs with @defining in views
Regroup volume asset list
Merge remote-tracking branch 'remotes/origin/master' into gui
Merge remote-tracking branch 'github/gui'

Conflicts:
	app/views/volume/view.scala.html
Merge excerpt display in thumbList
Put excerpts first in toplevel volume assets
Merge branch 'master' of github:databrary/play
Update Slot.pageName with record idents
Simple optimizations on views.widget.slotList
work on assetFrame.scala.html for ubiquitous slot page.
Merge remote-tracking branch 'remotes/origin/master' into gui
Various more views optimizations for lists
Merge remote-tracking branch 'remotes/origin/master' into gui