Merge branch 'hotfix/0.0.3.1'
fix XSS vulnerability in conversations#new, closes #4010
Merge branch 'hotfix/0.0.3.2'
bundler should communicate with rubygems using ssl
release 0.0.3.3
Merge branch 'hotfix/0.0.3.3' into develop

Conflicts:
	Changelog.md
	config/defaults.yml