adding the PHPDoc stuff
adding common files from master