Merge pull request #16 from math1man/master

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

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

LinkDao updated
Updated LinkDao
Fixed datasource and connection issues