Fixed merge conflicts
Merge branch 'aiFix2' of https://github.com/lucaspi/AndroidRally into aiFix2