Added proof of concept basic merging, need to deal with getting facets in proper sorted order
Merge tag '1.1.1' into development

1.1.1
Merge branch 'development' of https://github.com/fluxtream/fluxtream-app into feature/timespan-merge
refactored some code to allow for fetching facets ordered by end time
switched over other bodytrack responders that were compatible with the simple timespan merge model
Changed width of grapher yaxes to 40px
Updated grapher for yaxes label abbreviations
Fixed Zeo.Sleep_Graph losing its rendering rules
Switch fitbit to use https instead of http
removed all references to signPostHelper

This should prevent rate overflows for good
removed all references to signPostHelper

This should prevent rate overflows for good
fixed bodytrack view deletion bug
Merge tag 'fitbit-https-rate-limit-fixes' into development

1.1.1-fitbit-hotfixes
mark/display timeseries-obtained fitbit data as 'allDay'

also, have all-day items show up in a separate, top section in the list view, and don't show them in the clock view
Don't display empty sleep facets on history import

and added a generic mechanism to mark certain facets as 'empty' - can probably be reused for the Bodymedia connector
Moved /admin API endpoint to /v1/admin to fix various controls in admin panel not working
adding support for food and user entry notifications
WIP: adding food logging support
fixed apiSubscriptions call to use POST, added water history import
added a simple test to reproduce the fitbit subscription 401 issue