ShawnAhmedIssam-3103 Finish Sprint 2
noting
Merge branch 'master' of https://github.com/ThomasTeam/RCS2