Modified mapping model, directives and UI
Merge branch 'newmapping' of https://github.com/cotrix/cotrixrep.git into newmapping
Fixed merge