modified ? : statements to use the getOptionValue(opt, defaultValue) method instead
Merge remote-tracking branch 'origin/download' into download

Conflicts:
	wikAPIdia-download/src/main/java/org/wikapidia/download/RequestedLinkGetter.java
modified ? : statements to use the getOptionValue(opt, defaultValue) method instead