Fix: reorder lines problem
Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php