Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap

Conflicts:
	Gemfile
Outlined new concept for multiple periodically recurring tasks (#3).
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks

Conflicts:
	Gemfile
	db/schema.rb
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
show header on fax PDF (closes bennibu#109)
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
move German translations to single file
remove superfluous newlines in German translation
move English translations to single file
fix translation errors and inconsistencies between German and English
fix i18n bug
make translation roundtrip over localeapp work without changes
add missing i18n text
do not fail when common_deploy is not installed
Improve performance of data-check-all
Remove test variable
Add percent sign for tax in forms
Reorder delivery articles
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views