map: bookmarkable wip
Merge branch 'master' into feature/bookmarkable
cookie domain
Merge branch 'master' into feature/bookmarkable

Conflicts:
	lib/assets/javascripts/gfw/gfw_lib.js.erb
map: layer selector: refactor
Merge branch 'master' into feature/bookmarkable
countries: show: alt
Merge branch 'master' into feature/bookmarkable
Merge branch 'master' into feature/bookmarkable
map: better layer selector
Merge branch 'master' into feature/bookmarkable
map: persistent urls (basemap, baselayer)
map: baselayer load on url
Merge pull request #422 from Vizzuality/feature/bookmarkable

Feature/bookmarkable