Add check for dataSourceId before executing query.
Add mock2 dataSource.
Add the mock2 dataSource into app and index
Change to correct path in app.js
swicth new data service to use a different data set than the original
Change mock2 to fake.
fix data source name
De-dupling the fake/mock REST endpoints
Merge branch 'develop' of github.com:ozone-development/meridian into feature/267/add-another-sample-data-service

Conflicts:
	app/components/tools/query/query.js

spines -- Also updating existing data sources to account for metadata changes
Merge pull request #288 from ozone-development/feature/267/add-another-sample-data-service

Feature/267/add another sample data service