Add more buttons for better testing.

* Add zoom-to-city button
* Add zoom in and out buttons
Merge branch 'master' of github.com:mapbox/mapbox-android-demo