Merge pull request #1 from Convey-Compliance/development

Unit moved from convey-private-libs
Merge pull request #2 from Convey-Compliance/taxport-power-view

Merge pull request #1 from Convey-Compliance/development