Merge branch 'develop'
Merge branch 'develop'
Updated messages.py with latest language, shortened all messages to < 140 char
Cleaned up messages.py
Merge branch 'master' into develop