Merge branch 'hostfix_v0.4.0' into develop

# Conflicts:
#	adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmSystemController.java
#	adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/model/AdmEquipment.java