merged json config files into package.json
Merge remote-tracking branch 'origin/develop'