added a profile proxy
added test
renamed java client
also renamed admin client
set the collate timer back to its original value
Merge branch 'develop' into client-proxy
Merge pull request #669 from john-hill/client-proxy

Client proxy