20130219
Merge branch 'master' of https://github.com/wudexin/npbs.git