TemplateForm - fixed a bug in the method displaying the logic expression
Report Page- Added escapeXml attribute to fieldconfigs which specifies
whether escaping is or is not applied when displaying the field on a
report page. The default value is true. Contribution by Joel Richardson
Merge branch 'dev' of github.com:intermine/intermine into dev