Correction on the routeur
Merge branch 'master' of https://github.com/ucbl/DataConfMashup

Conflicts:
	js/application/router/AppRouter.js

Modify the json configurations