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
NOJIRA only set view memory if it's non-PDF
default theme fix
eflux theme
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
theme stuff
NOJIRA Glenstone theme fixes
NOJIRA search fixes
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
NOJIRA update search engine with providence fixes
mattress theme
NOJIRA make sure object instance is always set
NOJIRA load multipart idno config properly
NOJIRA hide annotation tools
Merge branch 'master' of github.com:collectiveaccess/pawtucket2