Latest
Merge branch 'master' of github.com:anyTV/heartbeat

Conflicts:
	model/connection.php
Merge pull request #20 from robertsambuena/master

Pull