fixes #54
Merge pull request #60 from dotCMS/issue-54-cant-fix-htmlpage-conflicts-in-psql

fixes #54