Added the PHPem user group
Resolved conflicts and added PHPEM