Fix `.close img` looking off-center.
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'
Merge branch 'hotfix/0.0.3.3' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
[Sprites] add sprites for icon images
[Sprites] add sprites for branding
[Sprites] social media logos sprite usage
Merge branch 'develop' into diaspora_with_sprites

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
[Sprites] update sprites after develop merge
fix reshares in single post-view
add assets:preocompile prerequisite for cucumber specs on CI
update changelog
Merge pull request #4056 from marpo60/fix-4023

fix reshares in single post-view
Update en.yml

Only one sentence was not in future.
added sprites to .gitignore
Merge pull request #4039 from marpo60/diaspora_with_sprites

Add Sprites to Diaspora!