added zoom in/zoom out buttons
fixed merge conflicts
fixed map recenter, needs refactoring
Merge branch 'development' into map-zoom