update config.properties by pc
Merge remote-tracking branch 'origin/master'