Correct parameters for /filestore/conflicts API
Merge branch 'master' of github.com:everydo/site-developer