changes in PropertyMapping and MixinMapping to better preserve ordering
fix DisableQueryFilter
Merge branch 'master' of https://github.com/signumsoftware/framework