Glance storage support swift as alternative (tag) storage
Merge branch 'master' of github.com:chilicat/docker-registry

Conflicts:
	setup-configs.sh