tes commit
Merge branch 'master' of https://github.com/saifiahmada/saifiahmada

Conflicts:
	WebContent/WEB-INF/hibernate.cfg.xml
	src/applicationContext.xml
	src/hibernate.cfg.xml
yapz