bug fix
confrict removed
fixing stock location process
Cloned from online
Merge branch 'spare-part-module' into spare-part-module-impl
Spare part test modified
Merge branch 'spare-part-module' of github.com:clintonhealthaccess/memms into spare-part-module
Merge branch 'spare-part-module' into spare-part-module-impl
Merge branch 'spare-part-module-impl' of https://github.com/clintonhealthaccess/memms into spare-part-module-impl
Tests fixed
removed unnecessary comments