NOJIRA NewSchool-originated mods
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/newschool/conf/browse.conf
	themes/newschool/conf/browse.conf_local
	themes/newschool/conf/browse.conf_ns
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/newschool/conf/browse.conf
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/default/conf/app.conf