Merge remote-tracking branch 'origin/topic_bank' into topic_bank

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -38,7 +38,6 @@ class ExerciseReviewAndAnswer extends Component{
       super(props);
       this.state={
         data:undefined,
-        userName:undefined,
         questionPanelFixed:false,
         e_ReviewInfo:undefined,
         e_AnswerInfo:undefined,
@@ -166,7 +165,6 @@ class ExerciseReviewAndAnswer extends Component{
   getInfo=()=>{
     this.setState({
       courseName:this.props.current_user.course_name,
-      userName:this.props.current_user.username,
       isSpin:true
     })
 
@@ -493,7 +491,6 @@ class ExerciseReviewAndAnswer extends Component{
     let{
       data,
       questionPanelFixed,
-      userName,
       courseName,
       exercise,
       exercise_types,

public/react/src/modules/courses/poll/PollInfo.js

@@ -19,7 +19,6 @@ class PollInfo extends Component{
     super(props);
     this.state={
       courseName:undefined,
-      userName:undefined,
       poll:undefined,
       question_answered:undefined,
       question_types:undefined,
@@ -73,8 +72,7 @@ class PollInfo extends Component{
 
   getInfo=()=>{
     this.setState({
-      courseName:this.props.current_user.course_name,
+      courseName:this.props.current_user.course_name
-      userName:this.props.current_user.username
     })
     let pollId=this.props.match.params.pollId;
     let user_id=this.props.match.params.login;
@@ -291,7 +289,7 @@ class PollInfo extends Component{
 
   render(){
     let coursesId=this.props.match.params.coursesId;
-    let{poll,question_answered,question_types,questions,courseName,userName,
+    let{poll,question_answered,question_types,questions,courseName,
       inputArray,
       modalsType,
       modalsTopval,