Merge branch 'hotfix/0.0.3.1'
Merge branch 'hotfix/0.0.3.1' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
avoid posting empty comments

fix Jasmine test

updated changelog with bugfix #3836

fix changelog update

remove wrong bug fix line
Merge pull request #4008 from pestrada/3836-avoid-empty-comments

avoid posting empty comments
fix XSS vulnerability in conversations#new, closes #4010
Merge branch 'hotfix/0.0.3.2'
fix XSS vulnerability in conversations#new, closes #4010
Add the ability to upload photos from the mobile site
Merge pull request #4004 from movilla/upload_photo

Upload photo mobile. Close #3324
fix css and js error with upload photo mobile
Merge pull request #4015 from movilla/upload_photo_1

Fix css and js error with upload photo mobile
delegate parent_author to the target of a RelayableRetraction
add integration spec for retracting a comment
bundler should communicate with rubygems using ssl
Merge pull request #4018 from instrumentio/feature/bundler

bundler should communicate with rubygems using ssl
Do not fail on receiving a SignedRetraction via the public route
make randomly on postgres failing spec pending for now
only try to delete a post from a service if we're able to
roxml should be loaded from rubygems
Merge pull request #4024 from instrumentio/feature/corrupt-fsck-roxml

roxml should be loaded from rubygems