20140411
Merge branch 'guanjia' of github.com:liangxiaofei1100/ZhaoYanJuYou into guanjia