Added import and export of zones functionality to map registration
Merged conflicts