修复小数的精度问题
Merge branch 'master' of https://github.com/blueolive/Simple-Calculator

Conflicts:
	Calculator/src/mengwu/project/calculator/CalculatorActivity.java
color.xml
Merge branch 'master' of github.com:lts9165/Simple-Calculator into branch_for_tsli_1

Conflicts:
	Calculator/res/values/color.xml
修改小数格式化