Using includes and including controller in the template
Merge branch 'study' into develop
Merge branch 'develop'