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.
Removed unused acts_as_configurable gem.
Allow setting default locale in user settings migration.

Use DEFAULT_LOCALE=de to have german enabled for all users.
Merge branch 'rails3' into rails3-to-master

Conflicts:
	app/views/suppliers/shared_suppliers.haml
(git)Ignore localeapp config.
Updated locales from localeapp.
Changed API of multicoops rake tasks. Use TASK=sample:task

Fixed running rake task without multicoops wrapper.
Removed rails3 branch and updated Readme.
Handle missing due_date in weekly tasks migration.
Fxed encoding error when uploading files with non-ascii characters.
Fixed delivering emails to users.

There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
fix heroku deploy script (also closes #165)
first version of new translation: French
Merge branch 'master' into tests-rspec

Conflicts:
	Gemfile
update spec gems to make tests work again