Broken @Autowire SessionFactory sessionfactory
Broken @Autowire SessionFactory sessionfactory
Merge remote-tracking branches 'remotes/origin/Works' and 'remotes/origin/master' into Works

Conflicts:
	.idea/dataSources.xml
	Guestbook4.iml
	pom.xml
	src/main/java/com/springapp/mvc/controller/PostController.java
	src/main/java/com/springapp/mvc/domain/Post.java
	src/main/java/com/springapp/mvc/services/PostService.java
	src/main/webapp/WEB-INF/views/home.jsp
	src/main/webapp/WEB-INF/views/post_form.jsp
New changelist
(cherry picked from commit 70646fa)