Merge branch 'hotfix/edit_message_after_work_add'

* hotfix/edit_message_after_work_add:
  edited
fix background-color
Merge branch 'hotfix/fix_make_up' into develop

* hotfix/fix_make_up:
  fix background-color