Merge pull request #4979 from jhass/bump_sidekiq

Bump sidekiq
Display new conversation form on conversations/index
Merge pull request #5178 from svbergerem/new-conversations

Display new conversation form on conversations/index
Hide welcome to diaspora after all popovers are closed

As a side effect stabilizes signs up cuke
bump acts-as-taggable-on
bump sidekiq
bump coffee-script-source
bump fog
bump omniauth
bump handlebars_assets
bump jquery-rails
Merge pull request #5191 from jhass/bump_jquery

bump jquery-rails
Merge pull request #5190 from jhass/bump_handlebars

bump handlebars_assets

Conflicts:
	Gemfile
Merge branch 'develop' into social.mrzyx.de