moved default.json.upstream to the app/dashboard directory
Merge branch 'master' into qa