import manufacturer and origin too (closes #140)
allow import of files with categories that do not exist (map to no category)
Merge branch 'master' into multiimport

Conflicts:
	app/controllers/articles_controller.rb
Merge branch 'multiimport' into foodcoop-adam-new

Conflicts:
	app/views/articles/_edit_all_table.html.haml
do not use attr_accessible (yet) - mass assignment errors occur
Merge branch 'article-info-url' into foodcoop-adam-new