Merge branch 'hotfix/issue21'
Merge branch 'hotfix/25' into develop
GetControllerItem added to GlassController