Fix `.close img` looking off-center.
Merge branch 'hotfix/0.0.3.3'
Fix mobile view of deleted reshares
Hide comment button in the mobile view when not signed in
Merge pull request #4063 from movilla/reshare_mobile_delete

Mobile error 500 if a reshared (original) post will be deleted. Close #3409
Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop

Conflicts:
	Changelog.md
bump rails to 3.2.13, release 0.0.3.4
Merge branch 'hotfix/0.0.3.4' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
Update diaspora.yml.example

Fixed the wording so admins know invites are either enabled or disabled, and the number of invites is set by default to 25.
Merge pull request #4070 from workwareusa/patch-1

Update diaspora.yml.example
bump addressable
bump excon
bump sass
bump client_side_validations
bump coderay
bump guard
bump handlebars_assets
bump unicorn
bump safe_yaml
bump font-awesome-sass-rails