Adding map to main activity (and changing the library dependence accordingly)