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

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Article.java
ConceptDao!
ConceptDao!
Merge pull request #15 from rgold1/master

ConceptDao