Merge branch 'release/0.1.1' into develop
also include the submodules in pypi.
bump version
resolve merge conflicts
Merge branch 'release/0.1.2'