Added javadocs to Article
Merge branch 'master' of http://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Article.java
Merge branch 'master' of http://github.com/shilad/wikapidia
Merge branch 'master' of http://github.com/shilad/wikapidia
Merge branch 'master' of http://github.com/shilad/wikapidia
Merge branch 'master' of http://github.com/shilad/wikapidia
Merge branch 'master' of http://github.com/shilad/wikapidia

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

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

Conflicts:
	README.md