Merge branch 'master' of https://github.com/math1man/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/ArticleDao.java
	wikapidia-core/src/main/java/org/wikapidia/core/dao/ConceptDao.java
Merge branch 'master' of https://github.com/rgold1/wikapidia
stuff
Merge branch 'master' of https://github.com/math1man/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/TestDao.java