Integrate old and new equipment status list on modal
Merge changes
Minor JS fixes