some templates for php docs
small fix
merge
Merge branch 'master' into dev