Added proof of concept basic merging, need to deal with getting facets in proper sorted order
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