Hibernate Configuration
merging changes
Merge branch 'master' of https://github.com/jkamcc/magazine-spring

Conflicts:
	.gitignore
	java/com/app/model/Article.java
	java/com/app/model/Comment.java
	java/com/app/model/Section.java
	src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
	src/main/webapp/WEB-INF/spring/root-context.xml