Make comments editable
provide "delete own comments" as a configurable option
Merge branch 'master' into edit-comments-squashed

Conflicts:
	CHANGES.rst
Add a test for Acquisition in comments.
added test acquisition chain for unwrapped object

Conflicts:
	plone/app/discussion/tests/test_acquisition.py
Fix total comments index
Add dev.delib-da.1 to version pin
Refactor acquisition tests to define the expected behaviour when dealing with wrapped and unwrapped comments.
Add tests to confirm that some methods of a conversation incorrectly use an unwrapped comment to determine whether anonymous users can view.
Fixing test failures.
Back out internal version number
Remove DL's from portal message in templates.
Remove DL's from portal message in templates.
Merge pull request #49 from eea/master

Add tests for custom events and contentrules events/string substitutions
Merge pull request #43 from plone/remove-dt-dl-dd

Remove DL's from portal message in templates.
Merge pull request #38 from delib/evilbungle-comment-acquisition

Fixing incorrect behaviour with acquired permissions
Revert "Merge pull request #38 from delib/evilbungle-comment-acquisition"

This reverts commit e18598e316e824795e752e7bb1c90ee37dc1cc6f, reversing
changes made to fd6ac0788bf3ade982e60ede7ceda26b0c0e598e.

This pull request introduces two test failures. See http://jenkins.plone.org/job/plone-5.0-python-2.7/lastCompletedBuild/testReport/ for details.
rebased branch from master
fixed edit test
added Delete comments permission to manage comments deletion