updated template files

Conflicts:
	Gemfile.lock
	app/controllers/user_import_files_controller.rb
	app/controllers/user_import_results_controller.rb