try to fix rjb issue
Merge branch 'master' of github.com:mindpin/eshare

Conflicts:
	app/models/course_zip_importer.rb