add delete icon in reports list
fixed conflicts and added back spare part status changes code
Merge branch 'master' into listing-module
Merge branch 'listing-module' of github.com:clintonhealthaccess/memms into listing-module
Merge branch 'listing-module' of github.com:clintonhealthaccess/memms into listing-module
added no cost param to equipment, work order, and preventive order wizard step 2 and to all 3 custom listing controller methods
Merge branch 'customised-report-impl' into listing-module
Messages properties added
Messages properties added