bundle update
start moving from simple_form i18n to activerecord
add missing i18n
use i18n-js
i18n ordering javascript
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile
	Gemfile.lock
clean up price tooltips javascript
small i18n move
i18n simple_form move of tasks
i18n simple_form move of foodcoop
i18n simple_form move of suppliers
i18n simple_form move of deliveries
i18n simple_form move of invoices
i18n simple_form move of fax pdf
Merge branch 'master' into i18n

Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
bundle update
i18n simple_form move of remaining labels
fix category heading
fix stockit i18n reference
use rails-i18n translations