fix channel math and add ability to set group as "s" to skip channels
Merge branch 'develop' of ssh://git.freepbx.org/freepbx/dahdiconfig into develop
FREEPBX-7484 update faxdetect options. Remove yes, Add both
Merge branch 'develop' into release/2.11

Conflicts:
	includes/dahdi_cards.class.php