Merge commit
Merge branch 'dev' of https://github.com/haydenmc/ResistanceSMS.git