db init
load city markers
added leaflet images, deferred db, ngAnimate
map model
Merge branch 'dev' into gh-pages