Merge remote-tracking branch 'origin/HALDevelopment' into SixAxis
Merge branch 'HALDevSixAxis' of https://github.com/AgileManufacturing/HUniversal-Production-Utrecht into HALDevSixAxis
Fixed hardcoded equiplet2