Merge branch 'develop' of https://github.com/schmunk42/gii-template-collection into gcms