uu
Signed-off-by: hebidu <hebiduhebi@126.com>
20140716

Signed-off-by: hebidu <hebiduhebi@126.com>
Merge branch 'master' of git-goorayeweixin:gooraye/GoorayeWeixin