Merge with develop + fixes

Merge with develop.
Fixed data-importer about regions.