make resque worker function on non-multi-coop-installs too
update order result mail (fixing html quoting of quotes)
translation updates: capitalisations, order_result mail
beautify order mail
small translation changes
fix i18n key
import manufacturer and origin too (closes #140)
allow import of files with categories that do not exist (map to no category)
add default tax percentage to app_config
pass locale to datepicker, use gem for that
be safe even with locale string
Resolve merge conflicts