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
fixed typo
added DATASOURCE_NAME to cmapi and mock. This is used to to filter 'stopQuery'.
Merge pull request #297 from ozone-development/bug/280/csvTypo

bug/280/csvTypo
added clear to cmapi
Mock and datagrid now use 'keys' as an object. Extra feature: 'feature' is now not displayed on the datagrid.
some cleanup for mock-extension.
UI now sends over queryName/justification
Adding moment to server dependencies
Refactoring how metadata is handled server-side and adding additional fields per design discussion
Removing unnecessary comments and console.log statements
Merge pull request #310 from ozone-development/enhancement/294/metadata-refactor

Enhancement/294/metadata refactor
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