Merge branch 'release/0.3.0.0'
fix regression in conversations causing an infinite recursion (fix #4715)
fix regression in conversations causing an infinite recursion (fix #4715)

(cherry picked from commit 5c059b2925db882fadbd6b908e6706eb7fd5f379)

Conflicts:
	Changelog.md
bump to 0.3.0.1
Merge branch 'hotfix/0.3.0.1' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
Merge branch 'develop' of git://github.com/diaspora/diaspora into develop