@ .zg/.cfg: updated
Merge branch 'develop'