Not properly terminated paragraph tab
fix #517
Do not cache comment pages with filled in data

#518
classs feed needs to load template-functions since it sues some of them

fix #503
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/zp-extensions/contact_form/form.php

	modified:   zp-core/class-feed.php
	modified:   zp-core/template-functions.php
	modified:   zp-core/zp-extensions/comment_form.php
	modified:   zp-core/zp-extensions/contact_form/form.php
	modified:   zp-core/zp-extensions/zenpage/zenpage-class.php