Gii codestyle fixes #2
Merge pull request #3739 from umneeq/gii-codestyle-fixes-2

Fix Gii template variables order