fix emotion
Merge branch '0.49' into 0.50

Conflicts:
	src/org/qii/weiciyuan/support/smileypicker/SmileyMap.java
Merge branch '0.50' of https://github.com/qii/weiciyuan into 0.50
同步代码,2013-11-07