Update messages.py
Merge branch 'master' into develop
Reverted to older version of messages to respect SMS character limit
Merge branch 'develop'