Fixed conflict
Merge branch 'clientToModelCommands' of https://github.com/lucaspi/AndroidRally into clientToModelCommands