Article edit - removed output cache
Merge branch 'master' of github.com:sheeand/myTvTestDisc

Conflicts:
	sitemap_google.xml