Add haproxy log
Bug fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
	src/main/java/imperial/modaclouds/monitoring/datacollectors/monitors/ModacloudsMonitor.java