added teacher username check
added teacher username check
Merged master fixed conflict
Merge branch 'nkmittal4994-teacher'