upgraded some gems: capybara-webkit comes from the master at Github so that it works with Qt5
Merge branch 'master' of github.com:aventinesolutions/aventine-rails

Conflicts:
	Gemfile.lock