Cleanup

Cleanup of Android Lint warnings, .gitignore and other project file changes