fix student
merge with master
fix student controller
from master