Fix Android Manifest
Modify launching in Android Manifest
Merge pull request #336 from ndomar/C4_SalmaAmrAhmed_#42_OffererClaim

S[42] : modifing the launching activity
Issue #188 - solving conflicts
Issue #188 - fixing conflicts