Merge remote-tracking branch 'upstream/master'
Adding df correction, which also normalises df for boost queries
just a HUGE format commit
fixes a possible npe when supplying explicit boost queries
Merge branch 'master' of github.com:shopping24/querqy into shopping24-master

Conflicts:
	querqy-core/src/main/java/querqy/model/AbstractNode.java
	querqy-core/src/main/java/querqy/model/Clause.java
	querqy-core/src/main/java/querqy/model/SubQuery.java
	querqy-core/src/main/java/querqy/rewrite/commonrules/LineParser.java
	querqy-core/src/test/java/querqy/rewrite/commonrules/SimpleParserTest.java
Merge pull request/branch 'shopping24-master'