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
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
Merge pull request #288 from ozone-development/feature/267/add-another-sample-data-service

Feature/267/add another sample data service
Adding in the getMetadataByUserId function, updating integration tests
Adding rest endpoints, updating metadata requests to require username if they didn't already
Updating integration tests to test for requesting session/query that a user doesn't own
Merge pull request #311 from ozone-development/enhancement/295/metadatarest

Enhancement/295/metadatarest
Resolve merge conflict.