NOJIRA Mattress update; remove old mattress theme
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/mf/conf/browse.conf