dynamic forms
Merge origin/master

Conflicts:
	equipment.php