added distance and marker functions in map
Merge branch 'Felicia'
Merge branch 'master' of https://github.com/kekskrise/esh-2014