* Heartbeat : started working on the heartbeat for connected users
* Heartbeats : heartbeats working
* Heartbeats : changed timing of heartbeats
Merge branch 'Features/heartbeat' into develop