Merge branch 'hotfix/edit_end_reg_time'

* hotfix/edit_end_reg_time:
  edit end_reg_time
edited
Merge branch 'hotfix/remove_juror_show_link' into develop

* hotfix/remove_juror_show_link:
  edited