Updated heartbeat
Merge branch 'master' of https://github.com/zivc/Guano

Conflicts:
	lib/heartbeat.php
	version.json