resource sort and allowedContent adjustment
Merge branch 'master' of https://github.com/calliopeinitiative/marca