update nginx to match user php5-fpm is running as
Merge branch 'hotfix/nginx_user' into develop

Conflicts:
	manifests/files/nginx/nginx.conf