remove <p> for content.
Merge branch 'master' of https://github.com/jasli2/evolution