FREEPBX-8442 fixed bug with old dial patterns not showing up
Merge branch 'release/12.0' into release/13.0

Conflicts:
	page.routing.php
	views/trunks/trunk_header.php