few change in these file to fix minor bugs
few change in these file to fix minor bugs
Merge origin/master

Conflicts:
	src/main/webapp/createTeacher.xhtml