Mise en place traitement des cartes
Merge branch 'master' of https://github.com/davidmages/smartcard.git

Conflicts:
	res/values/strings.xml
	src/efrei/asyria/m1a/adapter/ListCardAdapter.java
	src/efrei/asyria/m1a/session/SessionLogin.java
	src/efrei/asyria/m1a/smartcard/CardListFragment.java
	src/efrei/asyria/m1a/smartcard/ConnectionActivity.java
	src/efrei/asyria/m1a/smartcard/MyCardFragment.java
Merge branch 'master' of https://github.com/davidmages/smartcard.git

Conflicts:
	src/efrei/asyria/m1a/session/SessionLogin.java
	src/efrei/asyria/m1a/smartcard/MyCardFragment.java