Add DAO
Add DAO
Add DAO
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/Hibernate_DAO_Spring_Freemarker_war_exploded.xml
	Hibernate_DAO_Spring_Freemarker/Hibernate_DAO_Spring_Freemarker.iml
	Hibernate_DAO_Spring_Freemarker/pom.xml
	Hibernate_DAO_Spring_Freemarker/src/main/java/DAO/ArticleDAOImpl.java
Add DAO