we keep zope page template implementation

This also fixes some cases where &#36: was used instead of $ ,
some cases where the { was lost ( ${foo} -> $foo} ) and also
a bad merge from previous commit where conflict markers were kept.