Merge branch 'test' of 13.56.215.252:/web/rpo/AnsjerFormal into test

 Conflicts:

	Controller/EquipmentManager.py

	Service/ModelService.py