afasf
Merge branch 'master' of https://github.com/synnex123/teamwork.git

Conflicts:
	WebRoot/WEB-INF/classes/applicationContext.xml
	WebRoot/change_psw.jsp
	src/applicationContext.xml