modif
Merge branch 'master' of github.com.jmorille:jmorille/nfcproxy

* 'master' of github.com.jmorille:jmorille/nfcproxy:
  proxy