fix MListMapping
fix QueryToken.CollectionProperties
Merge branch 'master' of https://github.com/signumsoftware/framework