Update README.md
Merge branch 'dev' into feature/4_officer_chat