coumpund metric fixes provided.
Merge branch 'dev' of https://github.com/puhw-dev/Monitor into dev

Conflicts:
	src/monitor/RestServer.java