Merge branch 'development' of github.com:opentox/opentox-client into development