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

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