Update for license file
Merge branch 'master' into release/2.11

Conflicts:
	functions.inc.php
	module.xml
	page.digium_phones.php