updated nginx config
Merge branch 'master' of github.com:moviepilot/mp.nginx-node

Conflicts:
	proxyerror.html