Merge branch 'sr' of https://github.com/shilad/wikAPIdia into sr

Conflicts:
	wikAPIdia-lucene/src/main/java/org/wikapidia/lucene/QueryBuilder.java
Merge remote-tracking branch 'origin/sr' into sr