Fixing some bad content cleanup…. str_replace resulted in empty content in certain situations...
Merge branch 'cole' - Fixing some bad content cleanup…. str_replace resulted in empty content...

Conflicts:
	plugins/public-pages/makers.php