NOJIRA New School modifications
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/default/views/Search/ca_collections_search_subview_html.php
	themes/default/views/Search/ca_entities_search_subview_html.php
	themes/default/views/Search/ca_objects_search_subview_html.php
	themes/default/views/Search/ca_occurrences_search_subview_html.php
	themes/default/views/Search/ca_places_search_subview_html.php