Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing.
Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers
Fixed bug in with new shared multiple suppliers feature.
start using rspec for tests
add some rspec tests for supplier and article
expand rspec tests
fix small test bug
allow longer supplier phone number
fix tests
add group_order spec
Merge branch 'master' into tests-rspec
add group_order_article spec
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
update bootstrap assets
fix tooltip after bootstrap update
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock
add first integration test
more flexible login in spec helper
make integration spec work with javascript driver too