Japanese comment code
Fix major bug on SC07
Fix Conflict
Semi complete some code
Merge branch 'master' into thinhnv
Finish Upload+Change
Fix TeacherController + Teacher Layout conflict
Merge branch 'thinhnv'