Merge commit '12fce6c' into HEAD

# Conflicts:
#	index.js
#	src/configs/index.js
#	src/configs/machineGroupControl.json
#	src/helper/assetUtils.js
#	src/helper/childRegistrationUtils.js
#	src/helper/configUtils.js
#	src/helper/logger.js
#	src/helper/menuUtils.js
#	src/helper/menuUtils_DEPRECATED.js
#	src/helper/outputUtils.js
#	src/helper/validationUtils.js
#	src/measurements/Measurement.js
#	src/measurements/MeasurementContainer.js
#	src/measurements/examples.js
#	src/outliers/outlierDetection.js

src/configs/rotatingMachine.json

@@ -58,7 +58,7 @@
     },
     "functionality": {
       "softwareType": {
-        "default": "machine",
+        "default": "rotatingmachine",
           "rules": {
             "type": "string",
             "description": "Specified software type for this configuration."