已修改计算器UI
Merge branch 'master' of https://github.com/wuluoteam/lifehelper

Conflicts:
	bin/classes.dex
	bin/dexedLibs/android-support-v4-f4f030f6b376fcaeeb95288b1438c07c.jar
	bin/resources.ap_
	bin/鐢熸椿灏忓姪鎵�apk