Merge branch 'master' of https://github.com/Pkmmte/Personal-Calculator

Conflicts:
	PersonalCalculator/bin/PersonalCalculator.apk
	PersonalCalculator/bin/classes.dex
	PersonalCalculator/bin/classes/com/pk/personalcalculator/ActivityCalculator.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/ActivityMain.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/ActivitySettings$SettingsAdapter.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/FragmentManageItem.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/FragmentManageList$ManageAdapter.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$color.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$drawable.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$id.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$string.class
	PersonalCalculator/bin/resources.ap_
	PersonalCalculator/gen/com/pk/personalcalculator/R.java
	PersonalCalculator/res/layout/fragment_introduction.xml
	PersonalCalculator/res/values/strings.xml

merged request.