Merged 'develop'
config.js commented