change client to develop
Merge branch 'master' into develop
update tests
update baboon-client version