fix client result order
add place to unit relationship
add place to unit service
Merge remote-tracking branch 'remotes/origin/dev'