Merge branch 'master' into topaz. Update Changelog.

diff --cc CHANGELOG.md
index e2196a39afb8ed1c1d54fdf2311d4bb813cae4db,e2196a39afb8ed1c1d54fdf2311d4bb813cae4db..33824bbb32a0969602c3e2e01af386c53c179f3b
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,6 -10,6 +10,9 @@@ This project uses the changelog in acco
  - Added 'hw status'. This command makes the ARM print out some runtime information. (holiman) 
  - Added 'hw ping'. This command just sends a usb packets and checks if the pm3 is responsive. Can be used to abort certain operations which supports abort over usb. (holiman)
  - Added `data hex2bin` and `data bin2hex` for command line conversion between binary and hexadecimal (holiman)
++- Added Topaz (NFC type 1) protocol support ('hf topaz reader', 'hf list topaz', 'hf 14a raw -T', 'hf topaz snoop'). (piwi)
++- Added option c to 'hf list' (mark CRC bytes) (piwi)
++
  
  ### Changed
  - Revised workflow for StandAloneMode14a (Craig Young)

diff --cc armsrc/iso14443a.c
Simple merge