Adding PHPDoc, Update module:publish command and update README
Fix merge conflicts