Merge branch 'hotfix/0.0.1.1'
don't error out if the root of a reshare of a reshare got deleted, fixes #3546
Merge branch 'hotfix/3546-reshare'
bump version to 0.0.1.2
add simple background for unread messages/conversations mobile
changelog update before release
Merge branch 'release/0.0.2.0'

Conflicts:
	Changelog.md
	config/defaults.yml
Resize deletelabel and ignoreuser images to align them
Update changelog
Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment
[ci skip]
Conflicts:
	Changelog.md
Remove debugger from the Gemfile.

Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.

Conflicts:
	Gemfile.lock
update jasmine gem, removed useless spec, + changelog)
fix Gemfile.lock
don't use a rails method in a pre-rails environment
remove allowed failures from .travis.yml
bump selenium-webdriver
Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop
Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser
Merge pull request #3686 from movilla/flash_conversation_mobile

Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser
Fixed and improved Ukrainian translation