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

# By Ankit (5) and others
# Via khushals (3) and Ankit (2)
* 'master' of https://github.com/ankuchheda/VIrtualCardWallet:
  Trial
  Adding the photo feature.
  Changes to login activity layout.
  Added delete card and fixed mroe bugs relating the same. View the Readme.md
  Delete Card Added. DeleteBug removed. Cleaning the code next. MVP ready but need to test. Still bypassed the login. Please read the previous commit message as well. More details in Readme.
  Changes summarized on 29th Morning(Early one!)
  Integrated and partially tested. A-ok. Bypassed Auth. Changes noted, refer to readme.
  Removed listview bug.

Conflicts:
	bin/MyVirtualCardWallet.apk
	bin/classes.dex
	bin/classes/com/example/myvirtualcardwallet/LoginActivity$UserLoginTask.class
	bin/classes/com/example/myvirtualcardwallet/Options.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/resources.ap_
	gen/com/example/myvirtualcardwallet/R.java
	src/com/example/myvirtualcardwallet/LoginActivity.java