saving dev system
Merge branch 'master' of https://github.com/stgnet/asterisk_configs

Conflicts:
	pjsip.conf