Pushing clean Android Application
fix .gitignore merge conflict