Moved the data source creation logic from api core to rest-app
Merge pull request #498 from sheebans/master

Moved the data source creation logic from api core to rest-app