Login
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/applicationContext.xml
	src/main/webapp/WEB-INF/views/login/showlogin.jsp
added classes to hibernate config file