gilles commit
AndroidManifest.xml conflict resolved