refactor media_resource
refector uploader
Update README.md

增加coveralls的代码覆盖率统计
refector course import
重构用户导入
Merge branch 'master' of github.com:mindpin/eshare
change spec_helper
Merge branch 'master' of github.com:mindpin/eshare
update Gemfile
fix and merge
Merge branch 'master' of github.com:mindpin/eshare
trying another travis ci conf
Merge branch 'master' of github.com:mindpin/eshare into kaid/odocuconv

Conflicts:
	Gemfile
querstion
merge
增加提交作业
homework_upload sepc
update uploader js
Merge branch 'master' of github.com:mindpin/eshare
Merge branch 'master' of github.com:mindpin/eshare