Updated gems
Updated gems
Merge branch 'master' into import-export
Remove the ApplicationHelper import code from this branch
Don't use AR-import to create Categories and Items since has_many relationships aren't handled; fix Importer.merge; tests