create
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	Equipement/addEquipment.html
	Equipement/regulation_collect.html
	css/table.css
create