Merge branch 'master' into develop
disabling submodule on travis
docsgen cleanup
fixing travis
updating travis
Merge branch 'develop'