Merge branch 'master' of git://github.com/mlesicko/wikapidia
Merge branch 'master' of git://github.com/mlesicko/wikapidia
TestDao updated with Text.
Generic Iterator. Should solve memory problems.
Merge branch 'master' of https://github.com/mlesicko/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/TestDao.java