Added ping nodes for Proximity class in conf file
Merge remote-tracking branch 'origin/master'

Conflicts:
	Glitch.py
Added ping nodes for Proximity class in conf file