201407161424johncommit
201407161432johncommit
删除冲突代码
Merge branch 'biao' of https://github.com/BiaoPro/community into john
test confilct
test test