NOJIRA Glenstone live stuff
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/glenstone/conf/search.conf
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	app/plugins/FindingAid/conf/FindingAid.conf
	themes/glenstone/conf/search.conf
NOJIRA update views
NOJIRA fix typo leading to warning
NOJIRA fix typo leading to warning