Merge branch 'master' of https://github.com/udbc/catalogue

Correct metric label names for library

Merge pull request microservices-demo#36 from microservices-demo/refa…

…ctor/middleware

Refactor to use middleware from weaveworks/common.

Merge pull request microservices-demo#35 from microservices-demo/moni…

…toring/rationalise-prometheus

Add service name to prometheus labels

Merge pull request microservices-demo#31 from microservices-demo/moni…

…toring/rationalise-prometheus

Rationalise prometheus to produce RED metrics

Merge pull request microservices-demo#30 from microservices-demo/add_…

…circuitbreaker

Add circuitbreaker

Merge pull request microservices-demo#22 from microservices-demo/enha…

…ncement/opentracing

Enhancement/opentracing

Merge pull request microservices-demo#12 from microservices-demo/buil…

…d/user

Added user to dockerfile.

Merge pull request microservices-demo#9 from microservices-demo/catal…

…ogue-db

Adding catalogue db image to replace base mysql.