Merge branch 'develop'
Fixed typos in workers/tasks
Merge branch 'master' into develop
Reverted to older version of messages to respect SMS character limit