BUG+TEST
AV
Merge branch 'master' of https://github.com/icaruss/Monitoring

Conflicts:
	src/unix/UnixConnection.java