location domain object chanhes
resolved merge conflicts
resolved merge conflicts
code
Merge branch 'master' into rimal