lots of changes:
- base, remove inotify
- nginx proxy (etcd, consul based automatic load balancer included).
- mono xsp4 (.net 4)
Merge branch 'master' of https://github.com/glerchundi/docker-images

Conflicts:
	base/Dockerfile