PROV-620 Various processing fixes + support for nested <unit> tags
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	app/helpers/displayHelpers.php