Merge branch 'hotfix/remove_juror_show_link'

* hotfix/remove_juror_show_link:
  edited
Merge branch 'develop'

* develop:
  fix_bug
Merge branch 'develop'

* develop:
  fix juror users
add button
Merge branch 'hotfix/add_edit_work_button_For_admin' into develop

* hotfix/add_edit_work_button_For_admin:
  add button