Add Sprites to Diaspora!

fix reshares in single post-view

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

Conflicts:
	Changelog.md
	config/defaults.yml

decode tag name before passing it into TagFollowingAction

Add some tests for mobile page

* Complete the existing: Post mobile.
* Complete some test for no mobile: Edit profile, Post main.
* Fix little error css and js mobile.
* Add file-upload-custom javascripts to mobile.js.

Set max-age header to Amazon S3 resources

If post has photos, always include url in post to Facebook

If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706

Remove duplicate sentence from delete account confirmation pop up

Modular layouts

Show timestamp when hovering on comment time-ago string. Closes #4042

reset comment box height after posting a comment

refactor create comment method

Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them

Avoid redirect

Updated the Galician (gl) translation.