Merge branch 'ri_wrapper_dev' of github.com:ncbo/ontologies_api
Merge branch 'master' of github.com:ncbo/ontologies_api into ri_wrapper_dev