update 130730
Merge branch 'master' of https://github.com/syuemingfang/tkchurch