Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js

public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js

@@ -206,7 +206,6 @@ class CheckCodeModal extends Component{
               <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
 
                 { candidates && candidates.map( candidate => {
-                	console.log(candidates)
                   return (
                     <p className="clearfix mb7" key={candidate.id}>
                       <Checkbox className="fl" value={candidate.id} ></Checkbox>