import java.sql.Connection;
Updated LinkDao
Merge pull request #17 from rgold1/master

ConceptDao and ArticleDao
Merge pull request #18 from math1man/master

LinkDao updated
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/ConceptDao.java