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/ActivityManage.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/ActivitySettings$SettingsAdapter.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/ActivitySettings.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/FragmentLockdown.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/FragmentManageItem.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/FragmentManageList$ManageAdapter.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/FragmentManageList.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$color.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$dimen.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$layout.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$menu.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$string.class
	PersonalCalculator/bin/classes/com/pk/personalcalculator/R$style.class
	PersonalCalculator/bin/dexedLibs/android-support-v4-61a881bb05e9135af65469d6f8e3c0a9.jar
	PersonalCalculator/bin/dexedLibs/arity-2.1.7-bba7418391ad0533c33fb92214c89d34.jar
	PersonalCalculator/bin/resources.ap_
	PersonalCalculator/gen/com/pk/personalcalculator/R.java
	PersonalCalculator/res/drawable/border_dark_selector.xml
	PersonalCalculator/res/drawable/border_light_selector.xml
	PersonalCalculator/res/drawable/button_hololight_selector_light.xml
	PersonalCalculator/res/layout/activity_calculator.xml
	PersonalCalculator/res/layout/fragment_introduction.xml
	PersonalCalculator/res/values/color.xml
	PersonalCalculator/res/values/strings.xml
	PersonalCalculator/src/com/pk/personalcalculator/ActivityCalculator.java

Merged request.