Merge pull request #14 from dummerbd/rfid

Rfid
Forgot save on IDCard
Fixed conflicts