Minor fixes (query offset usage, files & directories dir, typos)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/query/WikiQuery.java