fixing issues with sorting
Merge branch 'integration' of https://github.com/60frames/api-server into integration
Merge commit '642f1676678607da59189d25343f5ed355cd6179' into HEAD