removed that silly random import
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/bjhecht/wikapidia0p4
Merge branch 'master' of https://github.com/shilad/wikapidia
temp
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
...
Merge branch 'master' of https://github.com/mlesicko/wikapidia
LocalArticleDao and related changes
Category DAOs
LocalArticleDao and related changes
Merged all the LocalPageDao children and straightened out conflicts
cleared imports
cleared imports
...
Javadoc all of the things!