bump sidekiq
fix #2645
  * refactor a bit #weekly_user_stats
  * pass 0 instead of "" to i18n
  * use the first week if none is provided
Merge pull request #4625 from diaspora/fix_2645

fix #2645
Refactor conversations css + fix inconsistent height of conversations list bug
port conversations view to bootstrap
fix facebox in conversations view
remove unused code
change layout
Fix posting to Twitter by correctly catching over limit exception (#4627). Also when doing a retry, make smaller cuts to max characters
fix mobile
use bootstrap labels
Merge pull request #4622 from svbergerem/improve-conversations-view

Improve conversations view, port to bootstrap
bump recommended ruby version to 2.0.0
Merge pull request #4636 from MrZYX/bump_ruby

bump recommended ruby version to 2.0.0
Merge pull request #4197 from MrZYX/bump_sidekiq

Update Sidekiq
Merge pull request #4628 from jaywink/4627-twitter-truncation-problem

Fix posting to Twitter by correctly catching over limit exception
#4550: Fix strip HTML when posting
#4550: Added strip_html method
#4550: Removed html tags for each posting service and added specs
#4550: Removed the method from status_message.rb file :)