Update capybara.
Update docile.
Update multi_json.
Update Bundler to 1.5.2.
Update childprocess.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile.lock
Automatic schema update.