NOJIRA New School in progress change
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/newschool/views/Details/ca_objects_audio_digital_html.php
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
ns audio_digital view
conflict resolution
audio detail ad multisearch collection result fixes new school
Merge branch 'master' of github.com:collectiveaccess/pawtucket2