Changing DAO
Merge branch 'master' of https://github.com/jkamcc/magazine-spring
Resolving conflict and solving Section error tests
Conflicts:
	src/main/java/org/jks/service/impl/ArticleServiceImpl.java
	src/test/java/org/jks/service/TestServices.java