Merge remote-tracking branch 'remotes/origin/master' into category

Conflicts:
	wikapidia-loader/src/main/java/org/wikapidia/dao/load/RedirectLoader.java
	wikapidia-loader/src/main/java/org/wikapidia/dao/load/WikiTextDumpLoader.java