Up client
Merge branch 'develop' of github.com:neontribe/docready_api into develop

Conflicts:
	docready_api/client