End of Friday Commit!
Merge branch 'master' of http://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/LocalPageDao.java
Merge branch 'master' of http://github.com/shilad/wikapidia
Push to pull
Merge branch 'master' of http://github.com/shilad/wikapidia
Updates to LocalPageDao (possibly debunked by Matt)

JavaDocs for PageType
Merge pull request #27 from rgold1/master

PageType
begin pagedaos
...
Merge branch 'master' of https://github.com/mlesicko/wikapidia
...
Merge branch 'master' of https://github.com/mlesicko/wikapidia
LocalArticleDao and related changes