measurement data added
conflict fix
added countries
Merge branch 'master' of https://github.com/argeset/set-meta