Merge branch 'l30'

Conflicts:
	university-hibernate/pom.xml
	university-hibernate/src/main/resources/application-Context.xml
	university-hibernate/src/main/resources/logback.xml
	university-hibernate/src/main/resources/mvc-core-config.xml
	university-hibernate/src/main/resources/mvc-view-config.xml
	university-hibernate/src/main/resources/spring/business-config.xml
	university-hibernate/src/main/resources/spring/mvc-core-config.xml
	university-hibernate/src/main/resources/spring/mvc-view-config.xml
	university-hibernate/src/main/webapp/WEB-INF/jsp/Index.jsp
	university-hibernate/src/main/webapp/WEB-INF/jsp/welcome.jsp
	university-hibernate/src/main/webapp/WEB-INF/web.xml
	university-hibernate/university-hibernate.iml
	university-hibernate/university-hibernate.ipr
	university-hibernate/university-hibernate.iws