Fixed path to the PHP XML-RPC library.
Minor code reformatting.
Merge branch 'dev' into test