Datasource Wizard
changes to main and controller
Merge branch 'master' of github.com:SCI-Utah/cnome