Merge pull request #11 from jttorate/master
Merge pull request #12 from jttorate/master

-- set salesoffice as optional in zone
Merge remote-tracking branch 'upstream/master'
-- add salesoffice default zone