for merge
Merge branch 'master' of git://github.com/dycforever/conf_bak