Metrics initialization
Merge branch 'master' of github.com:datasalt/splout-db

Conflicts:
	splout-server/src/main/java/com/splout/db/qnode/QNodeHandlerContext.java
Merge branch 'master' of github.com:datasalt/splout-db