Code clean up and heartbeat layout
Merge branch 'master' of https://github.com/InceptiveAspect/CalsTrack.git