FREEPBX-6415 #QA adds invert and passcode support to timeconditions
Merge branch 'release/2.11' into develop

Conflicts:
	module.xml
Merge branch 'release/2.11' into release/12.0

Conflicts:
	functions.inc.php
	module.xml
cleanup xss
FREEPBX-7754 spelling fixes
Merge branch 'release/12.0' into develop
version bump
Merge branch 'release/2.11' into develop
Merge branch 'develop' into release/12.0
Merge branch 'release/2.11' into develop
Merge branch 'develop' into release/12.0
Redo module_hook calls to use static obj
Merge branch 'develop' into release/12.0

Conflicts:
	module.xml
[Module Tag script: timeconditions 12.0.5]
Merge branch 'release/2.11' into develop

Conflicts:
	module.xml
Merge branch 'develop' into release/12.0