2014-8-21 linyb 修改db.properties配置
Merge remote-tracking branch 'origin/master'