Fixed site save issue
Merge pull request #674 from colibri-software/site_save_bug

Fixed site save issue
Merge branch 'v2.0.x'