Merge branch 'master' of ssh://192.168.136.45:10022/SERVER/AnsjerServer

# Conflicts:
#	Controller/EquipmentInfo.py