Update SemanticMediaWiki (merge query-optimizer and fix-conjuction-of-disjunctions)