Removed unused name fieldon IDCard
Fixed conflicts
Merge pull request #15 from dummerbd/rfid

Rfid