Merge branch 'dev_upgrade' of http://39.100.92.250:5000/station/amos-convertor-view into dev_upgrade

# Conflicts:
#	src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js