snmp discovery
Merge branch 'master' of https://github.com/daliworks/sensorjs

Conflicts:
	lib/sensor/driver_cfg.json