NOJIRA misc NewSchool theme improvements
NOJIRA Fix parse/replace issue with <ifdef>, <ifcount> and <ifnotdef>
Merge branch 'master' of github.com:collectiveaccess/pawtucket2