encoded identifiers in Comet mappings
Merge branch 'dev' of https://github.com/cotrix/cotrixrep.git into dev