Simple_format was adding  <p> and </p> on new annotations.
When it was removed, the issue 1299 was solved.
Merge pull request #1351 from tiagochst/issue-1299

Closes #1299