Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	app/controllers/application_controller.rb

public/react/src/modules/courses/elearning/Elearning.js

@@ -237,7 +237,7 @@ class Elearning extends Component{
 	}
 
 	render(){
-		let{description,whethertoedit,isSpin,start_learning,hidestartshixunsreplacevalues,learned,last_shixun,stages} =this.state;
+		let{description,whethertoedit,isSpin,start_learning,hidestartshixunsreplacevalues,learned,last_shixun,stages,isRender} =this.state;
     const  isNotMembers=this.props.isNotMember();//非课堂成员
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		return(