Experimenting with logging
Merge branch 'virtual_units' of github.com:mikesname/docview into virtual_units
Fixes for selecting correct descriptions from 2-to-3 letter lang codes
Merge branch 'master' into virtual_units

Conflicts:
	modules/core/app/models/DocumentaryUnit.scala
	modules/core/app/views/Helpers.scala