Fix data attributes problem and map display (fixes #315)
Merge branch 'master' of github.com:nabu-catalog/nabu