fixed queue

Conflicts:
	app/controllers/user_import_files_controller.rb
Merge branch 'master' of github.com:next-l/enju_leaf