Commit before merge.
Merge branch 'develop' of https://github.com/dockboard/docker-registry into develop

Conflicts:
	conf/app.conf
Merge branch 'develop' of https://github.com/dockboard/docker-registry into develop