FREEPBX-7950 Add checbox to block collect calls
FREEPBX-4095 Add an instructions only option to VM destinations
Fire the beeb replace with beep
Remove reload indicater FREEPBX-7983 This had been done in a prior branch but naming was wonkey
FREEPBX-8064 - escape values when adding or deleting adminstrative users
Merge pull request #2 in FREEPBX/core from hotfix/FREEPBX-8064 to master

* commit 'e6ac4c56ff438c4f0f0623c021a34e9b9dacc22f':
  FREEPBX-8064 - escape values when adding or deleting adminstrative users
  FREEPBX-7899 - publishing for 2.11
  FREEPBX-7899 - get_config from core should be the last one called, as a result moving this to use a priority in module.xml with a high enough priority
Merge branch 'FREEPBX-4095' of http://git.freepbx.org/scm/freepbx/core into develop
Merge branch 'FREEPBX-7950' of http://git.freepbx.org/scm/freepbx/core into develop
Merge branch 'release/2.11' into develop

* release/2.11:
  FREEPBX-8064 - escape values when adding or deleting adminstrative users

Conflicts:
	functions.inc.php
version bump
Merge branch 'release/2.11' into develop

* release/2.11:
  version bump

Conflicts:
	module.xml
Merge branch 'bugfix/FREEPBX-7983' of http://git.freepbx.org/scm/freepbx/core into develop