Model refactoring
Merge branch 'dev' of https://github.com/cotrix/cotrixrep.git into dev
Merge branch 'dev' of https://github.com/cotrix/cotrixrep.git into dev
Merge branch 'dev' of https://github.com/cotrix/cotrixrep.git into dev
First version of attribute type editing UI, not all properties supported