TransactionHistory error has been fix
Cancellation
Fix error for Cancellation
Merge branch 'master' of https://github.com/Dev-Marjun/MLWallet

Conflicts:
	bin/R.txt
	bin/classes/com/ml/lito/gmap/KPGoogleMap.class
	bin/classes/com/mlhuillier/mlwallet/R$layout.class
	bin/classes/com/mlhuillier/mlwallet/R$menu.class
	bin/classes/com/mlhuillier/mlwallet/R$string.class
	bin/classes/com/mlhuillier/mlwallet/R$style.class
	bin/classes/com/mlhuillier/mlwallet/R$styleable.class
	bin/classes/com/mlkptogo/ForgotPassword.class
	bin/classes/com/mlkptogo/LoginActivity.class
	bin/classes/com/mlkptogo/MenuActivity$DummySectionFragment.class
	bin/classes/com/mlkptogo/MenuActivity.class
	bin/classes/com/mlkptogo/NewUserActivity$ChangePIN.class
	bin/classes/com/mlkptogo/NewUserActivity.class
	bin/classes/com/mlkptogo/SelectAccountInfoOrReceiver.class
	bin/classes/com/mlkptogo/WebBrowser.class
	bin/classes/com/mlkptogo/account/harry/AccountInformation.class
	bin/classes/com/mlkptogo/account/harry/AccountMain.class
	bin/classes/com/mlkptogo/account/harry/AccountQuestion.class
	bin/classes/com/mlkptogo/account/harry/PersonalInformation.class
	bin/classes/com/mlkptogo/account/harry/ProfileInformation.class
	bin/classes/com/mlkptogo/account/harry/UpdateInformation.class

	bin/classes/com/mlkptogo/createaccount/harry/AccountLogin$MobileAccount.class
	bin/classes/com/mlkptogo/createaccount/harry/AccountLogin.class
	bin/classes/com/mlkptogo/createaccount/harry/EnterCustomerID.class
	bin/classes/com/mlkptogo/createaccount/harry/Information.class
	bin/classes/com/mlkptogo/createaccount/harry/LocationActivity.class
	bin/classes/com/mlkptogo/createaccount/harry/QuestionsActivity.class

	bin/classes/com/mlkptogo/createaccount/harry/RegistrationInformation$CustomerID.class

	bin/classes/com/mlkptogo/createaccount/harry/RegistrationInformation.class

	bin/classes/com/mlkptogo/kpwallet/albert/AsteriskPasswordTransformationMethod$PasswordCharSequence.class

	bin/classes/com/mlkptogo/kpwallet/albert/AsteriskPasswordTransformationMethod.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$1.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$10.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$11.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$12.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$13.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$14.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$15.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$16.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$17.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$18.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$19.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$2.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$5.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$6.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$7.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$8.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$9.class

	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$CancelSO.class

	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$PayIn$1$1.class

	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$PayIn$1$2.class

	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$PayIn$1.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$PayIn.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$Pin$1.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$Pin.class

	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory$isLogout.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionHistory.class
	bin/classes/com/mlkptogo/kpwallet/albert/TransactionPreview.class
	bin/classes/com/mlkptogo/receiver/chonex/AddReceiverActivity.class
	bin/classes/com/mlkptogo/receiver/chonex/CropOptionAdapter.class

	bin/classes/com/mlkptogo/receiver/chonex/ReceiverListViewMenu$CustomAdapter.class

	bin/classes/com/mlkptogo/receiver/chonex/ReceiverListViewMenu$ResizeImage$ErrListAdapter.class

	bin/classes/com/mlkptogo/receiver/chonex/ReceiverListViewMenu$ResizeImage.class
	bin/classes/com/mlkptogo/receiver/chonex/ReceiverListViewMenu.class
	bin/classes/com/mlkptogo/receiver/chonex/ReceiverMenuActivity.class
	bin/classes/com/mlkptogo/settings/Contact.class
	bin/classes/com/mlkptogo/settings/Info.class
	bin/classes/com/mlkptogo/topup/chonex/Kp_topup$Transact.class
	bin/classes/com/mlkptogo/topup/chonex/Kp_topup.class
	bin/classes/com/send_money/albert/Money_Rates$Rates.class
	bin/classes/com/send_money/albert/Money_Rates.class
	bin/classes/com/send_money/albert/Progress_Dialog.class
	bin/classes/com/send_money/albert/Send_Money$3.class
	bin/classes/com/send_money/albert/Send_Money$GetReceiver.class
	bin/classes/com/send_money/albert/Send_Money$Pin.class
	bin/classes/com/send_money/albert/Send_Money$Transact.class
	bin/classes/com/send_money/albert/Send_Money.class
	bin/classes/com/send_money/albert/Send_Money_Menu.class
	bin/classes/com/send_money/albert/Send_Money_Rates.class
	bin/classes/com/send_money/albert/SpinnerAdapter.class
	bin/classes/function/CropOptionAdapter.class
	bin/classes/function/CustomizedDialog.class
	bin/classes/function/EmailDialog.class
	bin/dexedLibs/android-support-v4-5823dc49f5c93f57168b5afe9672b03e.jar
	bin/dexedLibs/google-play-services-7f9f7cb6581e7ef1bd952387a91b897c.jar

	bin/dexedLibs/google-play-services_lib-74d880b978d22032e9a3bb86ec643a5b.jar
	bin/dexedLibs/kpgooglelib-e0674eebe7c9f0363015f70a634b2728.jar
	bin/dexedLibs/maps-7598c686f60e5edc40c06f27cbbca097.jar
	bin/dexedLibs/walletconfig-df79d4d788625963a7f43ee073b48b7e.jar
	gen/com/mlhuillier/mlwallet/R.java
	gen/com/mlhuillier/walletconfig/R.java
	res/layout/kp_wallet_preview.xml
	src/com/mlkptogo/kpwallet/albert/TransactionHistory.java