reordered arguments to optimize2
Merge branch 'master' of github.com:claesenm/optunity

Conflicts:
	wrappers/R/R/optunity.R