Corrected merge mistakes
Merge branch 'model0.2.1' of https://github.com/lucaspi/AndroidRally into model0.2.1