Momentjs bug fixed and some minor layout changes
Added simple heartbeat method
Merge branch 'test-data-botic'