Moved activation and license dialogs to page based navigation
Removing generated softwarepotential folder
Merge branch 'master'