add nrm client & service
merge develop
Merge branch 'chris' into develop