Merge branch 'master' of http://github.com/shilad/wikapidia
Merge branch 'master' of git://github.com/mlesicko/wikapidia
ArticleDao and LinkDao tested.
Benchmark - removed old code
Schema - added text
ArticleDao and LinkDao tested.
Merge branch 'master' of https://github.com/rgold1/wikapidia
Updated generatedcode
Updated ArticleDao
Merge branch 'master' of https://github.com/mlesicko/wikapidia

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