Fixed reference errors on client_service
Merge branch 'DEV' of https://github.com/meborda7/aabq-mmk into DEV