no message
Merge branch 'master' of https://github.com/ankuchheda/VIrtualCardWallet

Conflicts:
	bin/MyVirtualCardWallet.apk
	bin/classes/com/example/myvirtualcardwallet/AddCard.class
	bin/classes/com/example/myvirtualcardwallet/BuildConfig.class
	bin/classes/com/example/myvirtualcardwallet/Card.class
	bin/classes/com/example/myvirtualcardwallet/DetailView.class
	bin/classes/com/example/myvirtualcardwallet/Edit_card.class
	bin/classes/com/example/myvirtualcardwallet/ListCardsActivity.class
	bin/classes/com/example/myvirtualcardwallet/LocateActivity.class
	bin/classes/com/example/myvirtualcardwallet/LoginActivity$UserLoginTask.class
	bin/classes/com/example/myvirtualcardwallet/LoginActivity.class
	bin/classes/com/example/myvirtualcardwallet/MakeCard.class
	bin/classes/com/example/myvirtualcardwallet/Manifest$permission.class
	bin/classes/com/example/myvirtualcardwallet/Manifest.class
	bin/classes/com/example/myvirtualcardwallet/Options.class
	bin/classes/com/example/myvirtualcardwallet/R$attr.class
	bin/classes/com/example/myvirtualcardwallet/R$color.class
	bin/classes/com/example/myvirtualcardwallet/R$dimen.class
	bin/classes/com/example/myvirtualcardwallet/R$drawable.class
	bin/classes/com/example/myvirtualcardwallet/R$id.class
	bin/classes/com/example/myvirtualcardwallet/R$layout.class
	bin/classes/com/example/myvirtualcardwallet/R$menu.class
	bin/classes/com/example/myvirtualcardwallet/R$string.class
	bin/classes/com/example/myvirtualcardwallet/R$style.class
	bin/classes/com/example/myvirtualcardwallet/R.class
	bin/classes/com/example/myvirtualcardwallet/ShowImage.class
	bin/classes/com/example/myvirtualcardwallet/SignUpActivity$UserLoginTask.class
	bin/classes/com/example/myvirtualcardwallet/SignUpActivity.class
	bin/resources.ap_
	src/com/example/myvirtualcardwallet/LoginActivity.java