Merge branch 'master' into dev
map added before footer
map added
Merge branch 'dev'