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
adds i18n support to routes and application controller; default_locale is set to :en
fixes locales issue
adds rails-settings cached and rails-i18n-debug gems
adds a new user settings system + migration + rake task/worker updates
removes routes locale constrain and fixes some bugs
added user setting to set_locale
Fix StockArticle creation during delivery; small cleanups
Cleanup StockArticle creation during delivery
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks

Conflicts:
	config/locales/de.yml
Fixed schema.rb.
Users may delete all tasks of a group, i.e. delete the whole group.
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
Remove broken sort-by-price; comment redundancy of stock_change template
Merge branch master into i18n
finishes i18n set_locale with user settings
updates locale files
Add english translations for novel delivery functionality