bodytrack channels now pop in and out when connectors are added/deleted
Merge remote-tracking branch 'origin/development' into dev
Modified the map icon for Mymee
Merge branch 'development' of https://github.com/fluxtream/fluxtream-app into upstream_development
Added map icons for Zeo and FluxtreamCapture
Added map icons for Zeo and FluxtreamCapture
executing cleanup every hour (for debugging) and not deleting facets whose apiKeyId=0
Merge branch 'development' of github.com:fluxtream/fluxtream-app into development
not updating google_calendar data if we have no timeInterval
restore local time storage for localTime facets
restored fitbit sleep's local time storage
restored fitbit weight's local time storage
restored fitbit activity summary's local time storage
restored zeo sleep stat's local time storage
restored flickr photo's local time storage
forgot to add the restore localTime storage procedure for logged activities
debugging output cleanup
fixed problem in CSS that was making fluxtream photo icon not show up
Merge branch 'development' of github.com:fluxtream/fluxtream-app into development
modified channel names to show ellipsis when the overflow happens