PROV-635 component improvements
Merge branch 'develop' of github.com:collectiveaccess/providence into develop

Conflicts:
	app/helpers/displayHelpers.php