Add php-fpm role
Merge remote-tracking branch 'origin/master'