[Module Tag script: framework 2.11.0.39]
test out unique id generator
delete old
one final tweak
tweaks and finishing touches for this
Merge branch 'release/12.0' into release/13.0

* release/12.0:
  tweaks and finishing touches for this
  one final tweak
  delete old
  test out unique id generator

Conflicts:
	amp_conf/htdocs/admin/libraries/modulefunctions.class.php
Change variable name
Merge branch 'release/12.0' into release/13.0

* release/12.0:
  Change variable name
Merge branch 'release/13.0' of https://github.com/FreePBX/framework into release/13.0

* 'release/13.0' of https://github.com/FreePBX/framework:
  small fix
small fix
Merge branch 'release/12.0' into release/13.0

* release/12.0:
  small fix
Changes for internals
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Changes for internals
  [Module Tag script: framework 2.11.0.39]

Conflicts:
	amp_conf/htdocs/admin/libraries/module.functions.php
	amp_conf/htdocs/admin/libraries/utility.functions.php
Merge branch 'release/12.0' into release/13.0

* release/12.0:
  Changes for internals
  [Module Tag script: framework 2.11.0.39]
Merge branch 'release/13.0' of https://github.com/FreePBX/framework into release/13.0

* 'release/13.0' of https://github.com/FreePBX/framework:
  fixe supported