local change
Merge branch 'master' of https://github.com/huashizhenhua/TadpoleGame
"update function text"
Merge branch 'master' of https://github.com/huashizhenhua/TadpoleGame

Conflicts:
	TadpoleMusic/src/com/itap/voiceemoticon/weibo/WeiboLoginWebView.java