map firebase
remove add cache button to web/data
load markers from cache
resolve merge conflict