Adding BMO class
Merge branch 'master' into develop
BMO Updates
Merge branch 'release/2.11' into develop
Consolidate functions into bmo
not outputting conferences is a pretty severe bug
[Module Tag script: conferences 12.0.4]
cleanup
Merge branch 'release/2.11' into release/12.0

Conflicts:
	module.xml
FREEPBX-1953 #QA #comment Fixed conferences to use new string validation scheme
FREEPBX-1953 #QA #comment Now uses global helper function module_get_field_size() instead
Add feature code for combined BLF
FREEPBX-1953 - only check the display name if the function  module_get_field_size exists
Version Bump
cleanup xss
Merge branch 'develop' of ssh://git.freepbx.org/freepbx/conferences into develop

Conflicts:
	page.conferences.php
Merge branch 'release/12.0' into develop
FREEPBX-7715 remove depreciated functionality
Merge branch 'release/12.0' into develop
Merge branch 'master' into release/2.11