defaultHttpClient
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	glass/src/main/java/com/example/mytest/testglass/LiveCardMenuActivity.java
scan d'un qrcode