Update parameters/parameters

Updated the parameters file to new preset names
Merge branch 'unstable'

Conflicts:
	parameters/parameters
Merge branch 'unstable'
Merge branch 'unstable'
Merge branch 'unstable'
changed parameters back
removed validation of parameter preset name