create
Merge remote-tracking branch 'origin/master'

Conflicts:
	Equipement/changestate.html
create
Merge remote-tracking branch 'origin/master'