change domain object to domain
merge master
revert 278d103 / redo some changes that got lost
Merge pull request #662 from dimagi/ui-config

commtrack-related UI infrastructure changes