Merge branch 'master' into master

diff --cc CHANGELOG.md
index 3b454f64f8c99b07cfc5780aa1b29f558e7082c0,ca13dc858c1683cf5cf48935e1f39a7fb933e528..f10ef4e24f6f79a824839ed8e58e165090fdecae
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -18,7 -18,7 +18,8 @@@ This project uses the changelog in acco
  - Changed `hf 14a raw` - works with LED's and some exchange logic (Merlok)
  - Changed TLV parser messages to more convenient (Merlok)
  - Rewritten Legic Prime reader (`hf legic reader`, `write` and `fill`) - it is using xcorrelation now (AntiCat)
+ - `hf 14a` commands works via argtable3 commandline parsing library (Merlok)
 +- HID LF operations on firmware updated for complete native support of long (>37 bit) HID tags (grauerfuchs)
  
  ### Fixed
  - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)

diff --cc armsrc/appmain.c
Simple merge

diff --cc client/Makefile
Simple merge