Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

Conflicts:
	root.php

root.php

@@ -46,4 +46,6 @@
 		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
 		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
 	}
+
+// test
 ?>