Adapt to a new version of metrics in platform-client
Merge branch 'master' into kjq/metrics2

Conflicts:
	bower.json
Merge pull request #75 from tidepool-org/kjq/metrics2

Adapt to a new version of metrics in platform-client