Merge branch 'hotfix/0.0.3.3' into develop

Conflicts:
	Changelog.md
	config/defaults.yml

Changelog.md

@@ -25,6 +25,10 @@
 * Show timestamp when hovering on comment time-ago string. [#4042](https://github.com/diaspora/diaspora/issues/4042)
 * If sharing a post with photos to Facebook, always include URL to post [#3706](https://github.com/diaspora/diaspora/issues/3706)
 
+# 0.0.3.3
+
+* Switch Gemfile source to https to be compatible with bundler 1.3
+
 # 0.0.3.2
 
 * Fix XSS vulnerability in conversations#new [#4010](https://github.com/diaspora/diaspora/issues/4010)