PROV-1010 Fix mis-merged View.php class
Merge branch 'develop' of github.com:collectiveaccess/providence into develop