changes
merge
x<
tamere
gitignore
merge avec project action bar ... attentions peut etre bcp d'erreurs
qsdf
aez
Merge branch 'master' of https://github.com/couillette/MoneyXX

Conflicts:
	.classpath
	bin/MoneyXX.apk
	bin/classes.dex
	bin/classes/com/moneyxx/MyWalletActivity.class
	bin/classes/com/moneyxx/R$id.class
	bin/classes/com/moneyxx/R$layout.class
	bin/classes/com/moneyxx/R$menu.class
	bin/classes/com/moneyxx/R$string.class
	bin/classes/com/moneyxx/R$style.class
	bin/classes/com/moneyxx/SendBegActivity.class
	bin/classes/com/moneyxx/TransferRechargeActivity$1.class
	bin/classes/com/moneyxx/TransferRechargeActivity$2.class
	bin/classes/com/moneyxx/TransferRechargeActivity$3.class
	bin/classes/com/moneyxx/TransferRechargeActivity$4.class
	bin/classes/com/moneyxx/TransferRechargeActivity.class
	bin/resources.ap_
	gen/com/moneyxx/R.java
	res/drawable-hdpi/ic_jackpot.png
	res/drawable-hdpi/ic_wallet.png
	res/drawable-mdpi/ic_jackpot.png
	res/drawable-mdpi/ic_wallet.png
	res/drawable-xhdpi/ic_jackpot.png
	res/drawable-xhdpi/ic_wallet.png
	res/drawable-xxhdpi/ic_jackpot.png
	res/drawable-xxhdpi/ic_wallet.png
	src/com/moneyxx/TransferRechargeActivity.java