NOJIRA support restrictions in ifcount
NOJIRA Glenstone theme development
Merge branch 'master' of https://github.com/collectiveaccess/pawtucket2

Conflicts:
	app/helpers/displayHelpers.php
	themes/glenstone/assets/pawtucket/css/theme.css
	themes/glenstone/conf/browse.conf
	themes/glenstone/views/Browse/browse_results_images_html.php
	themes/glenstone/views/Browse/browse_results_list_html.php
	themes/glenstone/views/Details/ca_objects_artwork_html.php
	themes/glenstone/views/Search/ca_objects_search_subview_html.php