Use Abstracted function
Merge branch 'master' of http://stash.digium.com/stash/scm/freepbx/digium_phones

Conflicts:
	module.xml
Don't delete builtin ringtones