fix issues/188
Merge branch '0.49' into 0.50
Merge branch '0.50' of git://github.com/qii/weiciyuan into 0.50

Conflicts:
	res/values/dimens.xml