cleanup xss
Merge branch 'develop' of ssh://git.freepbx.org/freepbx/conferences into develop

Conflicts:
	page.conferences.php