Merge branch 'develop' of ssh://git.freepbx.org/freepbx/campon into develop

* 'develop' of ssh://git.freepbx.org/freepbx/campon:
  [Module Tag script: campon 2.11.0.1]

Conflicts:
	module.xml
Merge branch 'develop'

* develop: