Merge pull request #1 from UCDS/master

For recent changes
Added consumables Form
Changes in the equipments
Equipments and Consumables module
header conflict
layout changes