NOJIRA Newschool fixes
NOJIRA remove placeholder text
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/default/views/Gallery/detail_html.php
	themes/newschool/views/Gallery/set_item_info_html.php