All messages work
Fixed conflicts
Merge branch 'master' of https://github.com/integralhero/rally
Merge