Merge branch 'dev_hjm_banks_refactor' into topic_bank

# Conflicts:
#	public/react/src/modules/courses/busyWork/NewWorkForm.js

public/react/src/modules/courses/busyWork/NewWorkForm.js

@@ -114,7 +114,7 @@ class NewWorkForm extends Component{
 
       // const errKeys = Object.keys(err);  // || errKeys.length == 1 && errKeys[0] == 'content' && mdContnet
       if (!err) {
-        if (this.isEdit) {
+        if (this.state.isEdit) {
           this.doEdit(courseId, values)
         } else {
           this.doNew(courseId, values)