Consolidate migrations
correct initial schema
Rounded contact search input
Add correct schema
Merge pull request #5179 from svbergerem/rounded-contact-search-form

Rounded contact search input
Merge pull request #5173 from remcohh/develop

Consolidate migrations
drop Ruby 1.9 support, recommend Ruby 2.1
Add sign-up tests for mobile, minor adjustments to other mobile tests
Escape person name in contacts json

jQuery autoSuggest uses .html to insert it into the DOM
Merge branch 'release/0.4.1.0' into develop

Conflicts:
	app/controllers/conversations_controller.rb
	spec/controllers/conversations_controller_spec.rb
so turns out whether an id is serialized to a json integer or string
depends on the DB backend
Merge branch 'release/0.4.1.0' into develop
Merge pull request #5185 from goobertron/mobile_features

Add sign-up tests for mobile version
Merge pull request #5181 from jhass/bump_ruby

drop Ruby 1.9 support, recommend Ruby 2.1
bump sidekiq
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