Distributed DemoApp: Renamed MainPage to ConfigurationPage
Merge branch 'master' into CIBranch