fix bug
Merge branch 'master' of https://github.com/xjy2061/bp.git

Conflicts:
	beautyplan/src/com/trianglegroup/android/huimeili/utils/SkinUtil.java