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
Merge branch 'master' into uicleanup

Conflicts:
	app/views/articles/_edit_all_table.html.haml