Brent's suggestions for model and dao framework
removed that silly random import
Merge branch 'master' of https://github.com/shilad/wikapidia
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
Merge branch 'master' of https://github.com/bjhecht/wikapidia0p4
Merge branch 'master' of https://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 #26 from yli2/master

LocalLink
temp
Merge pull request #27 from rgold1/master

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

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/model/LocalLink.java
begin pagedaos
...
updated LocalLink
Merge branch 'master' of https://github.com/mlesicko/wikapidia
...