Corrected for some potential null pointer exceptions
Corrected for some potential null pointer exceptions
my update
Merge pull request #19 from math1man/master

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

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