Change input names
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	templates/index.tpl
Reorganize parameters
Tweak help buttons