move gii config to development
Merge branch 'issue-move-gii'