Ruby p392. Updated gems capybara and capybara-webkit.
Merge branch 'master' of github.com:ontohub/ontohub

Conflicts:
	Gemfile.lock