MapActivity actually makes sense now
.gitignore includes generated files and libraries. Build them yourselves
and spare some trouble
fixed conflict maybe?