Merge branch 'master' of https://github.com/SouthsideSoftware/delcom-indicator

Conflicts:
	DelcomIndicator.js
	package.json