Updated ToDo.
Up to now the parameter 'test' of function gMCP could be one of the following: "Bonferroni", "Simes", "Bretz2011" or "simple-parametric". We now introduced a new parameter 'upscale' (default FALSE) and restricted 'test' to: "Bonferroni", "Simes" and "parametric", where the old "Bretz2011" corresponds to 'test="parametric", upscale=TRUE' and the old "simple-parametric" to 'test="parametric", upscale=FALSE'. (For compatibility the old function calls actually still work, but are discouraged.)
Updated ToDo.
Merged pre-R3 into master.

Merge branch 'pre-R3'

Conflicts:
	pkg/gMCP/vignettes/gMCP/parametric.Rnw
Updated description of 'Weights of subgraphs are upscaled to 1'.