NOJIRA browse config mods
NOJIRA NewSchool mods
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/newschool/conf/browse.conf
	themes/newschool/views/mailTemplates/reg_conf.tpl
NOJIRA fix browse icon
NOJIRA update search engine
Merge branch 'master' of github.com:collectiveaccess/pawtucket2