Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox...