fix merge conflicts with AndroidManifest.xml
Merge branch 'master' of https://github.com/ang1ee/CarFollowingApp