glenstone theme
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/glenstone/conf/browse.conf
	themes/glenstone/conf/detail.conf
	themes/glenstone/conf/search.conf
	themes/glenstone/views/Browse/browse_results_images_html.php
	themes/glenstone/views/Search/ca_objects_search_subview_html.php
glenstone theme
Merge branch 'master' of github.com:collectiveaccess/pawtucket2