Enabled tests in develop
Added cross-zone templates support
Merge pull request #103 from maksimov/develop

Added cross-zone templates support