tutorat controller, view
Merge branch 'vince_develop' into develop