Merge branch 'hotfix/0.0.3.1'
fix XSS vulnerability in conversations#new, closes #4010
Merge branch 'hotfix/0.0.3.2'
decode tag name before passing it into TagFollowingAction, fixes #4027
Set max-age header to Amazon S3 resources
If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706
Merge pull request #4052 from jaywink/3706-facebook-missing-link

If post has photos, always include url in post to Facebook
Merge pull request #4048 from marpo60/s3_max_age

Set max-age header to Amazon S3 resources
* Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile
* 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.
Merge pull request #4031 from movilla/test_mobile

Add some tests for mobile page
Merge pull request #4029 from MrZYX/4027-unicode-tags

decode tag name before passing it into TagFollowingAction
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