1
Merge branch 'master' of https://github.com/kone/my

Conflicts:
	build/classes/com/kin/weixin/Weixin$FansCount.class
	build/classes/com/kin/weixin/Weixin$LoginJson.class
	build/classes/com/kin/weixin/Weixin$MsgForm.class
	build/classes/com/kin/weixin/Weixin$MsgJson.class
	build/classes/com/kin/weixin/Weixin$MsgType.class
	build/classes/com/kin/weixin/Weixin.class