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
Remove REEs garbage collection [ci skip]

We are not using REE anymore, so...
extract configruation system to a gem
* made number of unicorn worker processes configurable
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
 Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead.
add a necessary param, fix the retrieve limit
update changelog
Merge pull request #3777 from davecocoa/feature/3775-fix-tags-on-profile-edit

fix the tag handling on the profiles edit page
Update cat image so it's secure - new image from khanb1 on flickr.
Merge pull request #3781 from liamn/feature/update-cat-image

Update cat image so it's secure - new image from khanb1 on flickr.
Resize deletelabel and ignoreuser images to align them
Update changelog
lets see what travis has to say about the selenium prerelease
let travis find the selenium prerelease