include class inheritance in api docs [skip-ci]
Merge branch 'develop'
updated docs
Merge branch 'master' into develop