added proxy conf
Merge branch 'nfs' of https://github.com/dinesh121991/docker-oarcluster into nfs

Conflicts:
	images/nfs-server/Dockerfile