Updated messages for timeout and error.
Merge branch 'master' of https://github.com/jTurnerCPW/sprintAndroid.git