NOJIRA set width properly
Merge branch 'master-fix' of github.com:collectiveaccess/providence into master-fix
PROV-907 Reworked bundle displays to use display templates and work reliably with self-relationships and object-object lot relationships. This code now consistently evaluates templates with respect to the relationship, so interstitial data can be referenced. Various display placement-level settings for hierarchy display have been removed in favor of bundle template formatting. This should be more flexible and, arguably, simpler. It's certainly simpler and more reliable code-wise
Merge branch 'master-fix' of github.com:collectiveaccess/providence into master-fix
Merge branch 'master-fix' into develop

Conflicts:
	app/lib/ca/BundlableLabelableBaseModelWithAttributes.php
	app/models/ca_bundle_displays.php