fixed bug with ZoneSiteController
Merge branch 'develop'