Merge branch 'hotfix/zombie-threads-fix'
Merge branch 'hotfix/zombie-threads-fix'
Merge branch 'release/1.1'
import 30 days of intraday history on next incremental update
fixed RateLimitReached no longer being thrown by makeRestCall
added json parsing and transformation to feed to datastore
Fixed bug causing navigating to a grapher view to forget the view name
Removed unused/outdated test api
this is the actual fitbit rate limit

although we now have a more sophisticated way of respecting fitbit's rate limits by checking ad hoc response headers
fixed bodytrack time being in epoch seconds (not millis)

and allow for empty intraday records
re-enabled the limit checks

but it isn't going to used for the fitbit connector
better error handling, leverage Rate Limit headers
Fixed bug where new channels being added would mess up the channel selection of other channels
added production schema
links added for api advert and custom advert
Added API to get JSON representation of a model
Merge branch 'release/1.1.1' of https://github.com/fluxtream/fluxtream-app into release/1.1.1
Added proof of concept basic merging, need to deal with getting facets in proper sorted order
Merge branch 'development' into feature/fitbit-intraday
fixed default page