Merge remote-tracking branch 'upstream/master'

diff --combined CHANGELOG.md
index 42b6bcbeb1cde0f845d9dc45763a12cced15ef45,dc015c926bee9a6a9153d0b74d82fef7c880cfe6..649b4d04abc88d32900ca354fd9c04b15cf0f4a9
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -4,13 -4,18 +4,19 @@@ This project uses the changelog in acco
  
  ## [unreleased][unreleased]
  
+ ### Added
+ - ISO14443a stand-alone operation with ARM CFLAG="WITH_ISO14443a_StandAlone". This code can read & emulate two banks of 14a tag UIDs and write to "magic" cards  (Craig Young) 
+ 
+ ### Added
+ - AWID26 command context added as 'lf awid' containing realtime demodulation as well as cloning/simulation based on tag numbers (Craig Young)
+ 
  ### Changed
  - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
  
  ## [2.2.0][2015-07-12]
  
  ### Changed
 +- Added `hf 14b raw -s` option to auto select a 14b std tag before raw command 
  - Changed `hf 14b write` to `hf 14b sriwrite` as it only applied to sri tags (marshmellow)
  - Added `hf 14b info` to `hf search` (marshmellow)
  - Added compression of fpga config and data, *BOOTROM REFLASH REQUIRED* (piwi)

diff --combined client/cmdlf.c
index 1acee39b3fdd5327bf0fdd927398cc583434bf25,6dae51646ce950a1c1d62d95afe354fc6a775137..4c682a76f1b71cccfa682e6ed7ade580356975e7
--- 1/client/cmdlf.c
--- 2/client/cmdlf.c
+++ b/client/cmdlf.c
@@@ -22,6 -22,7 +22,7 @@@
  #include "util.h"
  #include "cmdlf.h"
  #include "cmdlfhid.h"
+ #include "cmdlfawid.h"
  #include "cmdlfti.h"
  #include "cmdlfem4x.h"
  #include "cmdlfhitag.h"
@@@ -388,7 -389,7 +389,7 @@@ int usage_lf_config(
        PrintAndLog("       b <bps>       Sets resolution of bits per sample. Default (max): 8");
        PrintAndLog("       d <decim>     Sets decimation. A value of N saves only 1 in N samples. Default: 1");
        PrintAndLog("       a [0|1]       Averaging - if set, will average the stored sample value when decimating. Default: 1");
 -      PrintAndLog("       t <threshold> Sets trigger threshold. 0 means no threshold");
 +      PrintAndLog("       t <threshold> Sets trigger threshold. 0 means no threshold (range: 0-128)");
        PrintAndLog("Examples:");
        PrintAndLog("      lf config b 8 L");
        PrintAndLog("                    Samples at 125KHz, 8bps.");
@@@ -1130,6 -1131,7 +1131,7 @@@ static command_t CommandTable[] 
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
        {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
+       {"awid",                CmdLFAWID,                  1, "{ AWID RFIDs... }"},
        {"io",            CmdLFIO,                1, "{ ioProx tags... }"},
        {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
        {"indalaclone", CmdIndalaClone,     0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},