[NFC Contacts] Cleaning the code
Merge pull request #205 from michalbe/nfc-contacts-temp

[NFC Contacts] Cleaning the code