Link to the commands JSON file
First datasource call
Merge branch 'master' of https://github.com/ucbl/DataConfMashup

Conflicts:
	js/application/configuration/Configuration.js
	js/application/router/AppRouter.js

Fix merge problems