Further portage
More porting debug
PHP port complete ready for test and debug
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/formulatrix.php