fixed template
Merge remote-tracking branch 'origin/master'
new user story, senior tutor views timesheet