All operators functional
Merge branch 'master' of https://github.com/sabin262/android

Conflicts:
	bin/Calculator.apk
	bin/classes.dex
	bin/classes/com/example/calculator/MainActivity$1.class
	bin/classes/com/example/calculator/MainActivity$10.class
	bin/classes/com/example/calculator/MainActivity$11.class
	bin/classes/com/example/calculator/MainActivity$12.class
	bin/classes/com/example/calculator/MainActivity$13.class
	bin/classes/com/example/calculator/MainActivity$14.class
	bin/classes/com/example/calculator/MainActivity$2.class
	bin/classes/com/example/calculator/MainActivity$3.class
	bin/classes/com/example/calculator/MainActivity$4.class
	bin/classes/com/example/calculator/MainActivity$5.class
	bin/classes/com/example/calculator/MainActivity$6.class
	bin/classes/com/example/calculator/MainActivity$7.class
	bin/classes/com/example/calculator/MainActivity$8.class
	bin/classes/com/example/calculator/MainActivity$9.class
	bin/classes/com/example/calculator/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/calculator/MainActivity.class
	bin/resources.ap_
	src/com/example/calculator/MainActivity.java