abcxz
Merge branch 'master' of git@github.com:veriqual/Calculator.git

Conflicts:
	calc/AndroidManifest.xml
	calc/project.properties
	calc/res/layout/calc.xml
	calc/src/com/example/calc/Calc.java
	calc/src/com/example/calc/MainActivity.java
	calc/src/com/example/calc/Sci.java