fix emotion
Merge branch '0.49' into 0.50

Conflicts:
	src/org/qii/weiciyuan/support/smileypicker/SmileyMap.java
Merge pull request #23 from qii/0.50

merge from qii/0.50