NOJIRA Pawtucket2 ongoing development
Merge branch 'master' of github.com:collectiveaccess/pawtucket3

Conflicts:
	app/controllers/SetsController.php
	themes/default/views/Sets/set_detail_thumbnail_html.php